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

Fix wrong log lag in cluster-zone check 

Refactor the calculation into a generic function
which is also used inside the 2.4 status API.

fixes #8805
This commit is contained in:
Michael Friedrich 2015-09-25 14:23:42 +02:00
parent 5ef4204d06
commit 717118fed4
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/methods/clusterzonechecktask.cpp
View File

@ -81,28 +81,28 @@ void ClusterZoneCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const Che
}
bool connected = false;
double lag = 0;
double zoneLag = 0;
BOOST_FOREACH(const Endpoint::Ptr& endpoint, zone->GetEndpoints()) {
double eplag = Utility::GetTime() - endpoint->GetRemoteLogPosition();
if (endpoint->IsConnected())
connected = true;
if ((endpoint->GetSyncing() || !endpoint->IsConnected()) && eplag > lag)
lag = eplag;
double eplag = ApiListener::CalculateZoneLag(endpoint);
if (eplag > 0 && eplag > zoneLag)
zoneLag = eplag;
}
if (!connected) {
cr->SetState(ServiceCritical);
cr->SetOutput("Zone '" + zoneName + "' is not connected. Log lag: " + Utility::FormatDuration(lag));
cr->SetOutput("Zone '" + zoneName + "' is not connected. Log lag: " + Utility::FormatDuration(zoneLag));
} else {
cr->SetState(ServiceOK);
cr->SetOutput("Zone '" + zoneName + "' is connected. Log lag: " + Utility::FormatDuration(lag));
cr->SetOutput("Zone '" + zoneName + "' is connected. Log lag: " + Utility::FormatDuration(zoneLag));
}
Array::Ptr perfdata = new Array();
perfdata->Add(new PerfdataValue("slave_lag", lag));
perfdata->Add(new PerfdataValue("slave_lag", zoneLag));
cr->SetPerformanceData(perfdata);
checkable->ProcessCheckResult(cr);

15
lib/remote/apilistener.cpp
View File

@ -895,9 +895,9 @@ std::pair<Dictionary::Ptr, Dictionary::Ptr> ApiListener::GetStatus(void)
if (endpoint->GetName() == GetIdentity())
continue;
double eplag = Utility::GetTime() - endpoint->GetRemoteLogPosition();
double eplag = CalculateZoneLag(endpoint);
if ((endpoint->GetSyncing() || !endpoint->IsConnected()) && eplag > zoneLag)
if (eplag > 0 && eplag > zoneLag)
zoneLag = eplag;
allEndpoints++;
@ -945,6 +945,17 @@ std::pair<Dictionary::Ptr, Dictionary::Ptr> ApiListener::GetStatus(void)
return std::make_pair(status, perfdata);
}
double ApiListener::CalculateZoneLag(const Endpoint::Ptr& endpoint)
{
double remoteLogPosition = endpoint->GetRemoteLogPosition();
double eplag = Utility::GetTime() - remoteLogPosition;
if ((endpoint->GetSyncing() || !endpoint->IsConnected()) && remoteLogPosition != 0)
return eplag;
return 0;
}
void ApiListener::AddAnonymousClient(const JsonRpcConnection::Ptr& aclient)
{
ObjectLock olock(this);

2
lib/remote/apilistener.hpp
View File

@ -75,6 +75,8 @@ public:
void RemoveHttpClient(const HttpServerConnection::Ptr& aclient);
std::set<HttpServerConnection::Ptr> GetHttpClients(void) const;
static double CalculateZoneLag(const Endpoint::Ptr& endpoint);
/* filesync */
static Value ConfigUpdateHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params);