tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 14:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Checkable#ProcessCheckResult(): discard CR or delay its producers shutdown

Browse Source
This commit is contained in:
Alexander A. Klimov 2025-05-20 13:02:26 +02:00
parent f4691dd054
commit 36743f3100
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@
#include "base/convert.hpp" #include "base/convert.hpp"
#include "base/utility.hpp" #include "base/utility.hpp"
#include "base/context.hpp" #include "base/context.hpp"
#include <shared_mutex>
using namespace icinga; using namespace icinga;
@ -101,6 +102,7 @@ Checkable::ProcessingResult Checkable::ProcessCheckResult(const CheckResult::Ptr
using Result = Checkable::ProcessingResult; using Result = Checkable::ProcessingResult;
VERIFY(cr); VERIFY(cr);
VERIFY(producer);
{ {
ObjectLock olock(this); ObjectLock olock(this);
@ -135,6 +137,14 @@ Checkable::ProcessingResult Checkable::ProcessCheckResult(const CheckResult::Ptr
cr->SetCheckSource(command_endpoint->GetName()); cr->SetCheckSource(command_endpoint->GetName());
} }
std::shared_lock producerLock (*producer, std::try_to_lock);
if (!producerLock) {
// Discard the check result to not delay the current reload.
// We'll re-run the check immediately after the reload.
return Result::CheckableInactive;
}
/* agent checks go through the api */ /* agent checks go through the api */
if (command_endpoint && GetExtension("agent_check")) { if (command_endpoint && GetExtension("agent_check")) {
ApiListener::Ptr listener = ApiListener::GetInstance(); ApiListener::Ptr listener = ApiListener::GetInstance();