Only create downtimes from non-paused ScheduledDowntime objects in HA enabled cluster...

diff --git a/lib/icinga/scheduleddowntime.cpp b/lib/icinga/scheduleddowntime.cpp
index c092ca9f0d7f12f83bda08dd7bf3fd780325706e..449507e0c06e26090e1288713487131bec47d83d 100644 (file)
--- a/lib/icinga/scheduleddowntime.cpp
+++ b/lib/icinga/scheduleddowntime.cpp
@@ -95,13 +95,14 @@ void ScheduledDowntime::Start(bool runtimeCreated)
                l_Timer->Start();
        });
 
-       Utility::QueueAsyncCallback(std::bind(&ScheduledDowntime::CreateNextDowntime, this));
+       if (!IsPaused())
+               Utility::QueueAsyncCallback(std::bind(&ScheduledDowntime::CreateNextDowntime, this));
 }
 
 void ScheduledDowntime::TimerProc()
 {
        for (const ScheduledDowntime::Ptr& sd : ConfigType::GetObjectsByType<ScheduledDowntime>()) {
-               if (sd->IsActive())
+               if (sd->IsActive() && !sd->IsPaused())
                        sd->CreateNextDowntime();
        }
 }
@@ -235,6 +236,13 @@ std::pair<double, double> ScheduledDowntime::FindNextSegment()
 
 void ScheduledDowntime::CreateNextDowntime()
 {
+       /* HA enabled zones. */
+       if (IsActive() && IsPaused()) {
+               Log(LogNotice, "Checkable")
+                       << "Skipping downtime creation for HA-paused Scheduled Downtime object '" << GetName() << "'";
+               return;
+       }
+
        double minEnd = 0;
 
        for (const Downtime::Ptr& downtime : GetCheckable()->GetDowntimes()) {