tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-09-21 16:57:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Perfdata writers: disconnect handlers from signals in Pause()

Browse Source 
as they would be re-connected in Resume() (HA).

Before they were still connected during pause and connected X+1 times
after X split-brains (the same data was written X+1 times).
This commit is contained in:
Alexander A. Klimov 2022-04-06 13:01:18 +02:00
parent 92e688b94a
commit 1eb274b550
12 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/perfdata/elasticsearchwriter.cpp
View File

@ -95,14 +95,18 @@ void ElasticsearchWriter::Resume()
m_FlushTimer->Reschedule(0);
/* Register for new metrics. */
Checkable::OnNewCheckResult.connect(std::bind(&ElasticsearchWriter::CheckResultHandler, this, _1, _2));
Checkable::OnStateChange.connect(std::bind(&ElasticsearchWriter::StateChangeHandler, this, _1, _2, _3));
Checkable::OnNotificationSentToAllUsers.connect(std::bind(&ElasticsearchWriter::NotificationSentToAllUsersHandler, this, _1, _2, _3, _4, _5, _6, _7));
m_HandleCheckResults = Checkable::OnNewCheckResult.connect(std::bind(&ElasticsearchWriter::CheckResultHandler, this, _1, _2));
m_HandleStateChanges = Checkable::OnStateChange.connect(std::bind(&ElasticsearchWriter::StateChangeHandler, this, _1, _2, _3));
m_HandleNotifications = Checkable::OnNotificationSentToAllUsers.connect(std::bind(&ElasticsearchWriter::NotificationSentToAllUsersHandler, this, _1, _2, _3, _4, _5, _6, _7));
}
/* Pause is equivalent to Stop, but with HA capabilities to resume at runtime. */
void ElasticsearchWriter::Pause()
{
m_HandleCheckResults.disconnect();
m_HandleStateChanges.disconnect();
m_HandleNotifications.disconnect();
Flush();
m_WorkQueue.Join();
Flush();

1
lib/perfdata/elasticsearchwriter.hpp
View File

@ -31,6 +31,7 @@ protected:
private:
String m_EventPrefix;
WorkQueue m_WorkQueue{10000000, 1};
boost::signals2::connection m_HandleCheckResults, m_HandleStateChanges, m_HandleNotifications;
Timer::Ptr m_FlushTimer;
std::vector<String> m_DataBuffer;
boost::mutex m_DataBufferMutex;

10
lib/perfdata/gelfwriter.cpp
View File

@ -90,14 +90,18 @@ void GelfWriter::Resume()
m_ReconnectTimer->Reschedule(0);
/* Register event handlers. */
Checkable::OnNewCheckResult.connect(std::bind(&GelfWriter::CheckResultHandler, this, _1, _2));
Checkable::OnNotificationSentToUser.connect(std::bind(&GelfWriter::NotificationToUserHandler, this, _1, _2, _3, _4, _5, _6, _7, _8));
Checkable::OnStateChange.connect(std::bind(&GelfWriter::StateChangeHandler, this, _1, _2, _3));
m_HandleCheckResults = Checkable::OnNewCheckResult.connect(std::bind(&GelfWriter::CheckResultHandler, this, _1, _2));
m_HandleNotifications = Checkable::OnNotificationSentToUser.connect(std::bind(&GelfWriter::NotificationToUserHandler, this, _1, _2, _3, _4, _5, _6, _7, _8));
m_HandleStateChanges = Checkable::OnStateChange.connect(std::bind(&GelfWriter::StateChangeHandler, this, _1, _2, _3));
}
/* Pause is equivalent to Stop, but with HA capabilities to resume at runtime. */
void GelfWriter::Pause()
{
m_HandleCheckResults.disconnect();
m_HandleNotifications.disconnect();
m_HandleStateChanges.disconnect();
m_ReconnectTimer.reset();
try {

1
lib/perfdata/gelfwriter.hpp
View File

@ -36,6 +36,7 @@ private:
OptionalTlsStream m_Stream;
WorkQueue m_WorkQueue{10000000, 1};
boost::signals2::connection m_HandleCheckResults, m_HandleNotifications, m_HandleStateChanges;
Timer::Ptr m_ReconnectTimer;
void CheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr);

3
lib/perfdata/graphitewriter.cpp
View File

@ -95,7 +95,7 @@ void GraphiteWriter::Resume()
m_ReconnectTimer->Reschedule(0);
/* Register event handlers. */
Checkable::OnNewCheckResult.connect(std::bind(&GraphiteWriter::CheckResultHandler, this, _1, _2));
m_HandleCheckResults = Checkable::OnNewCheckResult.connect(std::bind(&GraphiteWriter::CheckResultHandler, this, _1, _2));
}
/**
@ -103,6 +103,7 @@ void GraphiteWriter::Resume()
*/
void GraphiteWriter::Pause()
{
m_HandleCheckResults.disconnect();
m_ReconnectTimer.reset();
try {

1
lib/perfdata/graphitewriter.hpp
View File

@ -41,6 +41,7 @@ private:
boost::mutex m_StreamMutex;
WorkQueue m_WorkQueue{10000000, 1};
boost::signals2::connection m_HandleCheckResults;
Timer::Ptr m_ReconnectTimer;
void CheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr);

4
lib/perfdata/influxdbwriter.cpp
View File

@ -123,12 +123,14 @@ void InfluxdbWriter::Resume()
m_FlushTimer->Reschedule(0);
/* Register for new metrics. */
Checkable::OnNewCheckResult.connect(std::bind(&InfluxdbWriter::CheckResultHandler, this, _1, _2));
m_HandleCheckResults = Checkable::OnNewCheckResult.connect(std::bind(&InfluxdbWriter::CheckResultHandler, this, _1, _2));
}
/* Pause is equivalent to Stop, but with HA capabilities to resume at runtime. */
void InfluxdbWriter::Pause()
{
m_HandleCheckResults.disconnect();
/* Force a flush. */
Log(LogDebug, "InfluxdbWriter")
<< "Processing pending tasks and flushing data buffers.";

1
lib/perfdata/influxdbwriter.hpp
View File

@ -38,6 +38,7 @@ protected:
void Pause() override;
private:
boost::signals2::connection m_HandleCheckResults;
Timer::Ptr m_FlushTimer;
WorkQueue m_WorkQueue{10000000, 1};
std::vector<String> m_DataBuffer;

3
lib/perfdata/opentsdbwriter.cpp
View File

@ -81,7 +81,7 @@ void OpenTsdbWriter::Resume()
m_ReconnectTimer->Start();
m_ReconnectTimer->Reschedule(0);
Service::OnNewCheckResult.connect(std::bind(&OpenTsdbWriter::CheckResultHandler, this, _1, _2));
m_HandleCheckResults = Service::OnNewCheckResult.connect(std::bind(&OpenTsdbWriter::CheckResultHandler, this, _1, _2));
}
/**
@ -89,6 +89,7 @@ void OpenTsdbWriter::Resume()
*/
void OpenTsdbWriter::Pause()
{
m_HandleCheckResults.disconnect();
m_ReconnectTimer.reset();
Log(LogInformation, "OpentsdbWriter")

1
lib/perfdata/opentsdbwriter.hpp
View File

@ -37,6 +37,7 @@ protected:
private:
Shared<AsioTcpStream>::Ptr m_Stream;
boost::signals2::connection m_HandleCheckResults;
Timer::Ptr m_ReconnectTimer;
Dictionary::Ptr m_ServiceConfigTemplate;

3
lib/perfdata/perfdatawriter.cpp
View File

@ -53,7 +53,7 @@ void PerfdataWriter::Resume()
Log(LogInformation, "PerfdataWriter")
<< "'" << GetName() << "' resumed.";
Checkable::OnNewCheckResult.connect(std::bind(&PerfdataWriter::CheckResultHandler, this, _1, _2));
m_HandleCheckResults = Checkable::OnNewCheckResult.connect(std::bind(&PerfdataWriter::CheckResultHandler, this, _1, _2));
m_RotationTimer = new Timer();
m_RotationTimer->OnTimerExpired.connect(std::bind(&PerfdataWriter::RotationTimerHandler, this));
@ -66,6 +66,7 @@ void PerfdataWriter::Resume()
void PerfdataWriter::Pause()
{
m_HandleCheckResults.disconnect();
m_RotationTimer.reset();
#ifdef I2_DEBUG

1
lib/perfdata/perfdatawriter.hpp
View File

@ -34,6 +34,7 @@ protected:
void Pause() override;
private:
boost::signals2::connection m_HandleCheckResults;
Timer::Ptr m_RotationTimer;
std::ofstream m_ServiceOutputFile;
std::ofstream m_HostOutputFile;