Fix MasterServiceTests.testClusterStateUpdateLogging (elastic#38142)

Backport of elastic#38116 This changes the test to not use a `CountDownlatch`, instead adding an assertion for the final logging message and waiting until the `MockAppender` has seen it before proceeding. Related to df2c06f Resolves elastic#23739
talevy · Feb 1, 2019 · cf6c40a · cf6c40a
1 parent 9a09004
commit cf6c40a
Showing 1 changed file with 11 additions and 15 deletions.
diff --git a/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java
@@ -325,11 +325,16 @@ public void testClusterStateUpdateLogging() throws Exception {
                 MasterService.class.getCanonicalName(),
                 Level.DEBUG,
                 "*processing [test3]: took [3s] done publishing updated cluster state (version: *, uuid: *)"));
+        mockAppender.addExpectation(
+            new MockLogAppender.SeenEventExpectation(
+                "test4",
+                MasterService.class.getCanonicalName(),
+                Level.DEBUG,
+                "*processing [test4]: took [0s] no change in cluster state"));
 
         Logger clusterLogger = LogManager.getLogger(MasterService.class);
         Loggers.addAppender(clusterLogger, mockAppender);
         try {
-            final CountDownLatch latch = new CountDownLatch(4);
             masterService.currentTimeOverride = System.nanoTime();
             masterService.submitStateUpdateTask("test1", new ClusterStateUpdateTask() {
                 @Override
@@ -339,9 +344,7 @@ public ClusterState execute(ClusterState currentState) throws Exception {
                 }
 
                 @Override
-                public void clusterStateProcessed(String source, ClusterState oldState, ClusterState newState) {
-                    latch.countDown();
-                }
+                public void clusterStateProcessed(String source, ClusterState oldState, ClusterState newState) { }
 
                 @Override
                 public void onFailure(String source, Exception e) {
@@ -361,9 +364,7 @@ public void clusterStateProcessed(String source, ClusterState oldState, ClusterS
                 }
 
                 @Override
-                public void onFailure(String source, Exception e) {
-                    latch.countDown();
-                }
+                public void onFailure(String source, Exception e) { }
             });
             masterService.submitStateUpdateTask("test3", new ClusterStateUpdateTask() {
                 @Override
@@ -373,9 +374,7 @@ public ClusterState execute(ClusterState currentState) {
                 }
 
                 @Override
-                public void clusterStateProcessed(String source, ClusterState oldState, ClusterState newState) {
-                    latch.countDown();
-                }
+                public void clusterStateProcessed(String source, ClusterState oldState, ClusterState newState) { }
 
                 @Override
                 public void onFailure(String source, Exception e) {
@@ -391,21 +390,18 @@ public ClusterState execute(ClusterState currentState) {
                 }
 
                 @Override
-                public void clusterStateProcessed(String source, ClusterState oldState, ClusterState newState) {
-                    latch.countDown();
-                }
+                public void clusterStateProcessed(String source, ClusterState oldState, ClusterState newState) { }
 
                 @Override
                 public void onFailure(String source, Exception e) {
                     fail();
                 }
             });
-            latch.await();
+            assertBusy(mockAppender::assertAllExpectationsMatched);
         } finally {
             Loggers.removeAppender(clusterLogger, mockAppender);
             mockAppender.stop();
         }
-        mockAppender.assertAllExpectationsMatched();
     }
 
     public void testClusterStateBatchedUpdates() throws BrokenBarrierException, InterruptedException {