tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-11-03 21:25:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6826 from Icinga/bugfix/downtimes-recreate-satellite-6542

Browse Source 
Downtime#HasValidConfigOwner(): wait for ScheduledDowntimes
This commit is contained in:
Michael Friedrich 2018-12-18 16:12:34 +01:00 committed by GitHub
commit b40400e79f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/icinga/downtime.cpp
View File

@ -210,6 +210,10 @@ bool Downtime::IsExpired() const
bool Downtime::HasValidConfigOwner() const bool Downtime::HasValidConfigOwner() const
{ {
if (!ScheduledDowntime::AllConfigIsLoaded()) {
return true;
}
String configOwner = GetConfigOwner(); String configOwner = GetConfigOwner();
return configOwner.IsEmpty() || GetObject<ScheduledDowntime>(configOwner); return configOwner.IsEmpty() || GetObject<ScheduledDowntime>(configOwner);
} }

9
lib/icinga/scheduleddowntime.cpp
View File

@ -80,6 +80,8 @@ void ScheduledDowntime::OnAllConfigLoaded()
if (!GetCheckable()) if (!GetCheckable())
BOOST_THROW_EXCEPTION(ScriptError("ScheduledDowntime '" + GetName() + "' references a host/service which doesn't exist.", GetDebugInfo())); BOOST_THROW_EXCEPTION(ScriptError("ScheduledDowntime '" + GetName() + "' references a host/service which doesn't exist.", GetDebugInfo()));
m_AllConfigLoaded.store(true);
} }
void ScheduledDowntime::Start(bool runtimeCreated) void ScheduledDowntime::Start(bool runtimeCreated)
@ -339,3 +341,10 @@ void ScheduledDowntime::ValidateChildOptions(const Lazy<Value>& lvalue, const Va
BOOST_THROW_EXCEPTION(ValidationError(this, { "child_options" }, "Invalid child_options specified")); BOOST_THROW_EXCEPTION(ValidationError(this, { "child_options" }, "Invalid child_options specified"));
} }
} }
bool ScheduledDowntime::AllConfigIsLoaded()
{
return m_AllConfigLoaded.load();
}
std::atomic<bool> ScheduledDowntime::m_AllConfigLoaded (false);

4
lib/icinga/scheduleddowntime.hpp
View File

@ -23,6 +23,7 @@
#include "icinga/i2-icinga.hpp" #include "icinga/i2-icinga.hpp"
#include "icinga/scheduleddowntime-ti.hpp" #include "icinga/scheduleddowntime-ti.hpp"
#include "icinga/checkable.hpp" #include "icinga/checkable.hpp"
#include <atomic>
namespace icinga namespace icinga
{ {
@ -47,6 +48,7 @@ public:
static void EvaluateApplyRules(const intrusive_ptr<Host>& host); static void EvaluateApplyRules(const intrusive_ptr<Host>& host);
static void EvaluateApplyRules(const intrusive_ptr<Service>& service); static void EvaluateApplyRules(const intrusive_ptr<Service>& service);
static bool AllConfigIsLoaded();
void ValidateRanges(const Lazy<Dictionary::Ptr>& lvalue, const ValidationUtils& utils) override; void ValidateRanges(const Lazy<Dictionary::Ptr>& lvalue, const ValidationUtils& utils) override;
void ValidateChildOptions(const Lazy<Value>& lvalue, const ValidationUtils& utils) override; void ValidateChildOptions(const Lazy<Value>& lvalue, const ValidationUtils& utils) override;
@ -62,6 +64,8 @@ private:
std::pair<double, double> FindNextSegment(); std::pair<double, double> FindNextSegment();
void CreateNextDowntime(); void CreateNextDowntime();
static std::atomic<bool> m_AllConfigLoaded;
static bool EvaluateApplyRuleInstance(const Checkable::Ptr& checkable, const String& name, ScriptFrame& frame, const ApplyRule& rule); static bool EvaluateApplyRuleInstance(const Checkable::Ptr& checkable, const String& name, ScriptFrame& frame, const ApplyRule& rule);
static bool EvaluateApplyRule(const Checkable::Ptr& checkable, const ApplyRule& rule); static bool EvaluateApplyRule(const Checkable::Ptr& checkable, const ApplyRule& rule);
}; };