Subtract inapplicable suppressed notifications at a later point

Without this commit, every time the NotificationTimerHandler runs it
will discard notifications that don't apply to the reason of the latest
check result. This is probably intended to clear outdated suppressed
notifications immediately when the TimePeriod resumes, but it also clears
out important ones (see the test case).

This commit fixes that by clearing out inapplicable notifications when
the timer runs the first time after the TimePeriod resumes. By that time
we can expect that no new suppressed notifications will be added and all
notifications that don't conflict with the last check-result can still be
run.

Fixes #10575

Author: jschmidt-icinga

lib/notification/notificationcomponent.cpp

@@ -83,37 +83,34 @@ void FireSuppressedNotifications(const Notification::Ptr& notification)
 	int subtract = 0;
 	auto checkable (notification->GetCheckable());
 
-	for (auto type : {NotificationProblem, NotificationRecovery, NotificationFlappingStart, NotificationFlappingEnd}) {
-		if ((suppressedTypes & type) && !checkable->NotificationReasonApplies(type)) {
-			subtract |= type;
-			suppressedTypes &= ~type;
-		}
-	}
+	auto tp (notification->GetPeriod());
 
-	if (suppressedTypes) {
-		auto tp (notification->GetPeriod());
+	if ((!tp || tp->IsInside(Utility::GetTime())) && !checkable->IsLikelyToBeCheckedSoon()) {
+		for (auto type : {NotificationProblem, NotificationRecovery, NotificationFlappingStart, NotificationFlappingEnd}) {
+			if (!(suppressedTypes & type) || checkable->NotificationReasonSuppressed(type)) {
+				continue;
+			}
 
-		if ((!tp || tp->IsInside(Utility::GetTime())) && !checkable->IsLikelyToBeCheckedSoon()) {
-			for (auto type : {NotificationProblem, NotificationRecovery, NotificationFlappingStart, NotificationFlappingEnd}) {
-				if (!(suppressedTypes & type) || checkable->NotificationReasonSuppressed(type))
-					continue;
+			if (!checkable->NotificationReasonApplies(type)) {
+				subtract |= type;
+				continue;
+			}
 
-				auto notificationName (notification->GetName());
+			auto notificationName (notification->GetName());
 
-				Log(LogNotice, "NotificationComponent")
-					<< "Attempting to re-send previously suppressed notification '" << notificationName << "'.";
+			Log(LogNotice, "NotificationComponent")
+				<< "Attempting to re-send previously suppressed notification '" << notificationName << "'.";
 
-				subtract |= type;
-				SubtractSuppressedNotificationTypes(notification, subtract);
-				subtract = 0;
-
-				try {
-					notification->BeginExecuteNotification(type, checkable->GetLastCheckResult(), false, false);
-				} catch (const std::exception& ex) {
-					Log(LogWarning, "NotificationComponent")
-						<< "Exception occurred during notification for object '"
-						<< notificationName << "': " << DiagnosticInformation(ex, false);
-				}
+			subtract |= type;
+			SubtractSuppressedNotificationTypes(notification, subtract);
+			subtract = 0;
+
+			try {
+				notification->BeginExecuteNotification(type, checkable->GetLastCheckResult(), false, false);
+			} catch (const std::exception& ex) {
+				Log(LogWarning, "NotificationComponent")
+					<< "Exception occurred during notification for object '"
+					<< notificationName << "': " << DiagnosticInformation(ex, false);
 			}
 		}
 	}