Revert "Merge pull request openshift#28233 from candita/OCPBUGS-5943-…

…revertKnownProblem" This reverts commit 0098195, reversing changes made to 72fa973.
stbenjam · Nov 6, 2023 · 095e457 · 095e457
1 parent 0b52f41
commit 095e457
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/pkg/monitortestlibrary/pathologicaleventlibrary/duplicated_event_patterns.go b/pkg/monitortestlibrary/pathologicaleventlibrary/duplicated_event_patterns.go
@@ -223,6 +223,10 @@ var KnownEventsBugs = []KnownProblem{
 		Regexp: regexp.MustCompile("ns/openshift-etcd-operator namespace/openshift-etcd-operator -.*rpc error: code = Canceled desc = grpc: the client connection is closing.*"),
 		BZ:     "https://bugzilla.redhat.com/show_bug.cgi?id=2006975",
 	},
+	{
+		Regexp: regexp.MustCompile("reason/TopologyAwareHintsDisabled"),
+		BZ:     "https://issues.redhat.com/browse/OCPBUGS-13366",
+	},
 	{
 		Regexp:   regexp.MustCompile("ns/.*reason/.*APICheckFailed.*503.*"),
 		BZ:       "https://bugzilla.redhat.com/show_bug.cgi?id=2017435",

diff --git a/pkg/monitortests/testframework/watchevents/event_test.go b/pkg/monitortests/testframework/watchevents/event_test.go
@@ -98,26 +98,25 @@ func Test_recordAddOrUpdateEvent(t *testing.T) {
 			expectedMessage: "pathological/true interesting/true reason/SomethingHappened Readiness probe failed (40 times)",
 		},
 		{
-			name: "allowed pathological event with known bug (BZ 2000234)",
+			name: "allowed pathological event with known bug",
 			args: args{
 				ctx: context.TODO(),
 				m:   monitor.NewRecorder(),
 				kubeEvent: &corev1.Event{
 					Count:  40,
-					Reason: "ns/openshift-etcd pod/etcd-quorum-guard-42 node/worker-42 - reason/Unhealthy",
+					Reason: "TopologyAwareHintsDisabled",
 					InvolvedObject: corev1.ObjectReference{
 						Kind:      "Pod",
-						Namespace: "openshift-etcd",
-						Name:      "etcd-quorum-guard-42",
+						Namespace: "any",
+						Name:      "any",
 					},
-					Message:       "Readiness probe failed:",
+					Message:       "irrelevant",
 					LastTimestamp: metav1.Now(),
 				},
 				significantlyBeforeNow: now.UTC().Add(-15 * time.Minute),
 			},
-			// hmsg in expectedLocator is the hash of the entire expectedMessage except the number of times
-			expectedLocator: "ns/openshift-etcd pod/etcd-quorum-guard-42 hmsg/9100aa725d",
-			expectedMessage: "pathological/true interesting/true reason/ns/openshift-etcd pod/etcd-quorum-guard-42 node/worker-42 - reason/Unhealthy Readiness probe failed: (40 times)",
+			expectedLocator: "ns/any pod/any hmsg/e13faa98ab",
+			expectedMessage: "pathological/true interesting/true reason/TopologyAwareHintsDisabled irrelevant (40 times)",
 		},
 	}
 	for _, tt := range tests {