commit f7af02ebe39d448f74413ddba575ba1d96059210
author Mike Drob <mdrob@apache.org> Thu Dec 03 16:32:07 2020 -0800
committer Mike Drob <mdrob@apple.com> Thu Dec 03 16:33:14 2020 -0800
tree e20838dac5ec6c05b2eef809e3cec8e69826191f
parent 5caadc12f4b00b882ec6235d317c82d823d21ff7

SOLR-14992 Wait for node down before checking for node up (#2115)

solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java

diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java
index d66b313..deb2dd0 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java
@@ -126,6 +126,7 @@
     collectionName = suggestedCollectionName();
     expectThrows(SolrException.class, () -> getCollectionState(collectionName));
     cluster.getSolrClient().setDefaultCollection(collectionName);
+    cluster.waitForAllNodes(30);
   }
 
   @Override
@@ -254,8 +255,9 @@
     JettySolrRunner jetty = getJettyForReplica(s.getReplicas(EnumSet.of(Replica.Type.PULL)).get(0));
     SolrCore core = jetty.getCoreContainer().getCores().iterator().next();
 
-    for (int i = 0; i < 5; i++) {
+    for (int i = 0; i < (TEST_NIGHTLY ? 5 : 2); i++) {
       cluster.expireZkSession(jetty);
+      waitForState("Expecting node to be disconnected", collectionName, activeReplicaCount(1, 0, 0));
       waitForState("Expecting node to reconnect", collectionName, activeReplicaCount(1, 0, 1));
       // We have two active ReplicationHandler with two close hooks each, one for triggering recovery and one for doing interval polling
       assertEquals(5, core.getCloseHooks().size());