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

Fix SOFT/HARD state counting logic for check attempts <= 2 

fixes #12592
This commit is contained in:
Michael Friedrich 2016-09-27 11:29:25 +02:00
parent 0d71be774e
commit 3571965fef
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,16 +192,22 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
if (!children.empty())
OnReachabilityChanged(this, cr, children, origin);
} else {
if (old_attempt + 1 >= GetMaxCheckAttempts()) {
/* OK -> NOT-OK change, first SOFT state. Reset attempt counter. */
if (IsStateOK(old_state)) {
SetStateType(StateTypeSoft);
attempt = 1;
}
/* SOFT state change, increase attempt counter. */
if (old_stateType == StateTypeSoft && !IsStateOK(old_state)) {
SetStateType(StateTypeSoft);
attempt = old_attempt + 1;
}
/* HARD state change (e.g. previously 2/3 and this next attempt). Reset attempt counter. */
if (attempt >= GetMaxCheckAttempts()) {
SetStateType(StateTypeHard);
} else if (old_stateType == StateTypeSoft && !IsStateOK(old_state)) {
SetStateType(StateTypeSoft);
attempt = old_attempt + 1; // NOT-OK -> NOT-OK counter
} else if (IsStateOK(old_state)) {
SetStateType(StateTypeSoft);
attempt = 1; // OK -> NOT-OK transition, reset the counter
} else {
attempt = old_attempt;
attempt = 1;
}
if (!IsStateOK(cr->GetState())) {