Fix flaky test MasterServiceTests.testClusterStateUpdateLoggingWithDebugEnabled (#15204) (#15597)

opensearch-trigger-bot[bot] · github-actions[bot] · web-flow · commit c8bed7c19f1d · 2024-09-03T08:01:06.000-04:00
* Fix test MasterServiceTests.testClusterStateUpdateLoggingWithDebugEnabled (cherry picked from commit b23c9de) Signed-off-by: Sumit Bansal <sumitsb@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
diff --git a/server/src/test/java/org/opensearch/cluster/service/MasterServiceTests.java b/server/src/test/java/org/opensearch/cluster/service/MasterServiceTests.java
@@ -534,8 +534,8 @@ public void onFailure(String source, Exception e) {
                 });
                 assertBusy(mockAppender::assertAllExpectationsMatched);
                 // verify stats values after state is published
-                assertEquals(1, clusterManagerService.getClusterStateStats().getUpdateSuccess());
-                assertEquals(0, clusterManagerService.getClusterStateStats().getUpdateFailed());
+                assertBusy(() -> assertEquals(1, clusterManagerService.getClusterStateStats().getUpdateSuccess()));
+                assertBusy(() -> assertEquals(0, clusterManagerService.getClusterStateStats().getUpdateFailed()));
             }
         }
     }
@@ -699,8 +699,8 @@ public void onFailure(String source, Exception e) {
                 });
                 assertBusy(mockAppender::assertAllExpectationsMatched);
                 // verify stats values after state is published
-                assertEquals(1, clusterManagerService.getClusterStateStats().getUpdateSuccess());
-                assertEquals(0, clusterManagerService.getClusterStateStats().getUpdateFailed());
+                assertBusy(() -> assertEquals(1, clusterManagerService.getClusterStateStats().getUpdateSuccess()));
+                assertBusy(() -> assertEquals(0, clusterManagerService.getClusterStateStats().getUpdateFailed()));
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -534,8 +534,8 @@ public void onFailure(String source, Exception e) {`
`534`	`534`	`});`
`535`	`535`	`assertBusy(mockAppender::assertAllExpectationsMatched);`
`536`	`536`	`// verify stats values after state is published`
`537`		`- assertEquals(1, clusterManagerService.getClusterStateStats().getUpdateSuccess());`
`538`		`- assertEquals(0, clusterManagerService.getClusterStateStats().getUpdateFailed());`
	`537`	`+ assertBusy(() -> assertEquals(1, clusterManagerService.getClusterStateStats().getUpdateSuccess()));`
	`538`	`+ assertBusy(() -> assertEquals(0, clusterManagerService.getClusterStateStats().getUpdateFailed()));`
`539`	`539`	`}`
`540`	`540`	`}`
`541`	`541`	`}`
`@@ -699,8 +699,8 @@ public void onFailure(String source, Exception e) {`
`699`	`699`	`});`
`700`	`700`	`assertBusy(mockAppender::assertAllExpectationsMatched);`
`701`	`701`	`// verify stats values after state is published`
`702`		`- assertEquals(1, clusterManagerService.getClusterStateStats().getUpdateSuccess());`
`703`		`- assertEquals(0, clusterManagerService.getClusterStateStats().getUpdateFailed());`
	`702`	`+ assertBusy(() -> assertEquals(1, clusterManagerService.getClusterStateStats().getUpdateSuccess()));`
	`703`	`+ assertBusy(() -> assertEquals(0, clusterManagerService.getClusterStateStats().getUpdateFailed()));`
`704`	`704`	`}`
`705`	`705`	`}`
`706`	`706`	`}`