fix: pathological event exception logic cleanup

openshift · Dec 5, 2024 · 3528906 · 3528906
1 parent 291d45a
commit 3528906
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/pkg/monitortestlibrary/pathologicaleventlibrary/duplicated_event_patterns.go b/pkg/monitortestlibrary/pathologicaleventlibrary/duplicated_event_patterns.go
@@ -797,13 +797,13 @@ func IsExcludedContainerBackoffRestart(topology string, event monitorapi.Interva
 	exceptions := []exceptionVariants{
 		{
 			// https://issues.redhat.com/browse/OCPBUGS-45071
-			containerName:      "container/manager", //
+			containerName:      "container/manager",
 			topologyToExclude:  "single",
 			namespaceToExclude: "openshift-operator-controller",
 		},
 		{
 			// https://issues.redhat.com/browse/OCPBUGS-45071
-			containerName:      "container/manager", //
+			containerName:      "container/manager",
 			topologyToExclude:  "single",
 			namespaceToExclude: "openshift-catalogd",
 		},
@@ -821,14 +821,17 @@ func IsExcludedContainerBackoffRestart(topology string, event monitorapi.Interva
 
 			// If both are specified, both must match
 			if val.topologyToExclude != "" && val.namespaceToExclude != "" {
-				return topologyExcluded && namespaceExcluded
+				if topologyExcluded && namespaceExcluded {
+					return true
+				} else {
+					continue
+				}
 			}
 
 			return topologyExcluded || namespaceExcluded
 		}
 	}
 	return false
-
 }
 
 func getInstallCompletionTime(kubeClientConfig *rest.Config) *metav1.Time {

diff --git a/pkg/monitortests/node/legacynodemonitortests/pathological_events.go b/pkg/monitortests/node/legacynodemonitortests/pathological_events.go
@@ -61,7 +61,7 @@ func testBackoffStartingFailedContainer(clusterData platformidentification.Clust
 
 	// Filter out any known pathological events
 	events = events.Filter(
-		monitorapi.Or(
+		monitorapi.And(
 			monitorapi.Not(pathologicaleventlibrary.IsDuringAPIServerProgressingOnSNO(clusterData.Topology, events)),
 			monitorapi.Not(func(interval monitorapi.Interval) bool {
 				return pathologicaleventlibrary.IsExcludedContainerBackoffRestart(clusterData.Topology, interval)