tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 07:34:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10210 from Icinga/endpoint-client-dropped-early

Browse Source 
JsonRpcConnection: Don't drop client from cache prematurely
This commit is contained in:
Julian Brost 2025-01-09 10:29:27 +01:00 committed by GitHub
commit b96dc39ea2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/remote/jsonrpcconnection.cpp
View File

@ -250,28 +250,42 @@ void JsonRpcConnection::Disconnect()
if (!m_ShuttingDown.exchange(true)) { if (!m_ShuttingDown.exchange(true)) {
JsonRpcConnection::Ptr keepAlive (this); JsonRpcConnection::Ptr keepAlive (this);
IoEngine::SpawnCoroutine(m_IoStrand, [this, keepAlive](asio::yield_context yc) { Log(LogNotice, "JsonRpcConnection")
Log(LogWarning, "JsonRpcConnection") << "Disconnecting API client for identity '" << m_Identity << "'";
<< "API client disconnected for identity '" << m_Identity << "'";
IoEngine::SpawnCoroutine(m_IoStrand, [this, keepAlive](asio::yield_context yc) {
m_OutgoingMessagesQueued.Set();
{
Timeout writerTimeout(
m_IoStrand,
boost::posix_time::seconds(5),
[this]() {
// The writer coroutine could not finish soon enough to unblock the waiter down blow,
// so we have to do this on our own, and the coroutine will be terminated forcibly when
// the ops on the underlying socket are cancelled.
boost::system::error_code ec;
m_Stream->lowest_layer().cancel(ec);
}
);
m_WriterDone.Wait(yc);
// We don't need to explicitly cancel the timer here; its destructor will handle it for us.
}
m_CheckLivenessTimer.cancel();
m_HeartbeatTimer.cancel();
m_Stream->GracefulDisconnect(m_IoStrand, yc);
// We need to unregister the endpoint client as soon as possible not to confuse Icinga 2,
// given that Endpoint::GetConnected() is just performing a check that the endpoint's client
// cache is not empty, which could result in an already disconnected endpoint never trying to
// reconnect again. See #7444.
if (m_Endpoint) { if (m_Endpoint) {
m_Endpoint->RemoveClient(this); m_Endpoint->RemoveClient(this);
} else { } else {
ApiListener::GetInstance()->RemoveAnonymousClient(this); ApiListener::GetInstance()->RemoveAnonymousClient(this);
} }
m_OutgoingMessagesQueued.Set(); Log(LogWarning, "JsonRpcConnection")
<< "API client disconnected for identity '" << m_Identity << "'";
m_WriterDone.Wait(yc);
m_CheckLivenessTimer.cancel();
m_HeartbeatTimer.cancel();
m_Stream->GracefulDisconnect(m_IoStrand, yc);
}); });
} }
} }