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

Another attempt at fixing the API deadlock

Browse Source 
fixes #6617
This commit is contained in:
Gunnar Beutner 2014-07-01 09:38:22 +02:00
parent 8b1579381e
commit 65e69fcd37
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/remote/apiclient.cpp
View File

@ -65,6 +65,17 @@ ConnectionRole ApiClient::GetRole(void) const
} }
void ApiClient::SendMessage(const Dictionary::Ptr& message) void ApiClient::SendMessage(const Dictionary::Ptr& message)
{
if (m_WriteQueue.GetLength() > 5000) {
Log(LogWarning, "remote", "Closing connection for API identity '" + m_Identity + "': Too many queued messages.");
Disconnect();
return;
}
m_WriteQueue.Enqueue(boost::bind(&ApiClient::SendMessageSync, this, message));
}
void ApiClient::SendMessageSync(const Dictionary::Ptr& message)
{ {
try { try {
ObjectLock olock(m_Stream); ObjectLock olock(m_Stream);

4
lib/remote/apiclient.hpp
View File

@ -23,6 +23,7 @@
#include "remote/endpoint.hpp" #include "remote/endpoint.hpp"
#include "base/stream.hpp" #include "base/stream.hpp"
#include "base/timer.hpp" #include "base/timer.hpp"
#include "base/workqueue.hpp"
#include "remote/i2-remote.hpp" #include "remote/i2-remote.hpp"
namespace icinga namespace icinga
@ -64,8 +65,11 @@ private:
ConnectionRole m_Role; ConnectionRole m_Role;
double m_Seen; double m_Seen;
WorkQueue m_WriteQueue;
bool ProcessMessage(void); bool ProcessMessage(void);
void MessageThreadProc(void); void MessageThreadProc(void);
void SendMessageSync(const Dictionary::Ptr& request);
}; };
} }

4
lib/remote/apilistener.cpp
View File

@ -364,6 +364,10 @@ void ApiListener::ApiTimerHandler(void)
if (endpoint->GetHost().IsEmpty() || endpoint->GetPort().IsEmpty()) if (endpoint->GetHost().IsEmpty() || endpoint->GetPort().IsEmpty())
continue; continue;
/* don't try to connect if there's already a connection attempt */
if (endpoint->GetConnecting())
continue;
Utility::QueueAsyncCallback(boost::bind(&ApiListener::AddConnection, this, endpoint)); Utility::QueueAsyncCallback(boost::bind(&ApiListener::AddConnection, this, endpoint));
} }
} }