From c67a9663afd4b9711ab4890395830da6659d1565 Mon Sep 17 00:00:00 2001
From: Lee Hinman <dakrone@users.noreply.github.com>
Date: Thu, 31 Jan 2019 17:13:19 -0700
Subject: [PATCH] Fix MasterServiceTests.testClusterStateUpdateLogging (#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 df2c06f6f30f7e23a6863a3f72fc3bdb7648885c
Resolves #23739
---
 .../cluster/service/MasterServiceTests.java   | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 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
index aadd48a9bd5..7ed3f45e505 100644
--- a/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java
+++ b/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java
@@ -328,11 +328,16 @@ public class MasterServiceTests extends ESTestCase {
                 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
@@ -342,9 +347,7 @@ public class MasterServiceTests extends ESTestCase {
                 }
 
                 @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) {
@@ -364,9 +367,7 @@ public class MasterServiceTests extends ESTestCase {
                 }
 
                 @Override
-                public void onFailure(String source, Exception e) {
-                    latch.countDown();
-                }
+                public void onFailure(String source, Exception e) { }
             });
             masterService.submitStateUpdateTask("test3", new ClusterStateUpdateTask() {
                 @Override
@@ -376,9 +377,7 @@ public class MasterServiceTests extends ESTestCase {
                 }
 
                 @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) {
@@ -394,21 +393,18 @@ public class MasterServiceTests extends ESTestCase {
                 }
 
                 @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 {