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

Author: Al2Klimov

lib/icinga/checkable-check.cpp

@@ -14,6 +14,7 @@
 #include "base/convert.hpp"
 #include "base/utility.hpp"
 #include "base/context.hpp"
+#include <shared_mutex>
 
 using namespace icinga;
 
@@ -134,6 +135,14 @@ Checkable::ProcessingResult Checkable::ProcessCheckResult(const CheckResult::Ptr
 			cr->SetCheckSource(command_endpoint->GetName());
 	}
 
+	std::shared_lock producerLock (*cr->GetProducer(), 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 */
 	if (command_endpoint && GetExtension("agent_check")) {
 		ApiListener::Ptr listener = ApiListener::GetInstance();

lib/icinga/checkresult.hpp

@@ -48,6 +48,11 @@ class CheckResult final : public ObjectImpl<CheckResult>
 	{
 	}
 
+	const CheckResultProducer::Ptr& GetProducer() const noexcept
+	{
+		return m_Producer;
+	}
+
 	double CalculateExecutionTime() const;
 	double CalculateLatency() const;