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

Merge pull request #10011 from Icinga/next-check-cluster-sync-issue 

Checkable: Don't recalculate `next_check` for remotely generated `cr`
This commit is contained in:
Julian Brost 2024-08-30 13:37:41 +02:00 committed by GitHub
parent ba200f74e1 ca7cc54438
commit 4c6b93d617
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/icinga/checkable-check.cpp
View File

@ -360,21 +360,28 @@ Checkable::ProcessingResult Checkable::ProcessCheckResult(const CheckResult::Ptr
bool is_flapping = IsFlapping(); bool is_flapping = IsFlapping();
if (cr->GetActive()) { // Don't recompute the next check when the current check isn't generated by this endpoint. When the check is
UpdateNextCheck(origin); // remotely generated we should've already received the "SetNextCheck" event before the "event::CheckResult"
} else { // cluster event. Otherwise, the next check received before this check will be invalidated and cause the Checkable
/* Reschedule the next check for external passive check results. The side effect of // "next_check/next_update" in a HA setup to always be different from the other endpoint as the "m_SchedulingOffset"
* this is that for as long as we receive results for a service we // is randomly initialised on each node.
* won't execute any active checks. */ if (!origin) {
double offset; if (cr->GetActive()) {
double ttl = cr->GetTtl(); UpdateNextCheck();
} else {
/* Reschedule the next check for external passive check results. The side effect of
* this is that for as long as we receive results for a service we
* won't execute any active checks. */
double offset;
double ttl = cr->GetTtl();
if (ttl > 0) if (ttl > 0)
offset = ttl; offset = ttl;
else else
offset = GetCheckInterval(); offset = GetCheckInterval();
SetNextCheck(Utility::GetTime() + offset, false, origin); SetNextCheck(Utility::GetTime() + offset);
}
} }
olock.Unlock(); olock.Unlock();