[TEST] Wait to lose master in Readiness tests (#86696) (#86991)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
elastic · May 20, 2022 · 699cbd4 · 699cbd4
1 parent 381a847
commit 699cbd4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/readiness/ReadinessClusterIT.java b/server/src/internalClusterTest/java/org/elasticsearch/readiness/ReadinessClusterIT.java
@@ -16,6 +16,7 @@
 import org.elasticsearch.test.readiness.ReadinessClientProbe;
 
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import static org.elasticsearch.test.NodeRoles.dataOnlyNode;
 import static org.elasticsearch.test.NodeRoles.masterNode;
@@ -133,6 +134,7 @@ public Settings onNodeStopped(String nodeName) throws Exception {
 
                 for (String dataNode : dataNodes) {
                     ReadinessService s = internalCluster().getInstance(ReadinessService.class, dataNode);
+                    s.listenerThreadLatch.await(10, TimeUnit.SECONDS);
                     tcpReadinessProbeFalse(s);
                 }
 

diff --git a/server/src/main/java/org/elasticsearch/readiness/ReadinessService.java b/server/src/main/java/org/elasticsearch/readiness/ReadinessService.java
@@ -43,7 +43,8 @@ public class ReadinessService extends AbstractLifecycleComponent implements Clus
 
     private volatile boolean active; // false;
     private volatile ServerSocketChannel serverChannel;
-    private CountDownLatch listenerThreadLatch;
+    // package private for testing
+    volatile CountDownLatch listenerThreadLatch = new CountDownLatch(0);
     final AtomicReference<InetSocketAddress> boundSocket = new AtomicReference<>();
     private final Collection<BoundAddressListener> boundAddressListeners = new CopyOnWriteArrayList<>();
 
@@ -152,7 +153,7 @@ synchronized void startListener() {
         this.listenerThreadLatch = new CountDownLatch(1);
 
         new Thread(() -> {
-            assert serverChannel != null && listenerThreadLatch != null;
+            assert serverChannel != null;
             try {
                 while (serverChannel.isOpen()) {
                     AccessController.doPrivileged((PrivilegedAction<Void>) () -> {