tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix deadlock in GraphiteWriter 

This fixes a deadlock in the GraphiteWriter feature, which is visible
during the reload process. The reload thread waits for the
GraphiteWriter to finish, but the GraphiteWriter can't finish because
it's stuck in `SendMetric()` waiting for a lock which is hold by the
reload thread.
This commit is contained in:
Michael Insel 2018-11-12 19:09:44 +00:00
parent 90de216cbb
commit b0cf92fd17
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/perfdata/graphitewriter.cpp
View File

@ -299,7 +299,7 @@ void GraphiteWriter::SendMetric(const String& prefix, const String& name, double
msgbuf << "\n"; msgbuf << "\n";
String metric = msgbuf.str(); String metric = msgbuf.str();
ObjectLock olock(this); boost::mutex::scoped_lock lock(m_StreamMutex);
if (!GetConnected()) if (!GetConnected())
return; return;

2
lib/perfdata/graphitewriter.hpp
View File

@ -27,6 +27,7 @@
#include "base/timer.hpp" #include "base/timer.hpp"
#include "base/workqueue.hpp" #include "base/workqueue.hpp"
#include <fstream> #include <fstream>
#include <boost/thread/mutex.hpp>
namespace icinga namespace icinga
{ {
@ -54,6 +55,7 @@ protected:
private: private:
Stream::Ptr m_Stream; Stream::Ptr m_Stream;
boost::mutex m_StreamMutex;
WorkQueue m_WorkQueue{10000000, 1}; WorkQueue m_WorkQueue{10000000, 1};
Timer::Ptr m_ReconnectTimer; Timer::Ptr m_ReconnectTimer;