Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

BasicDistributedZk2Test - wait for ZK connection to come back

Houston Putman0f8decddaa1a
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java
index 056c5e69c5e..513596533ff 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java
@@ -149,6 +149,14 @@ public abstract class AbstractBasicDistributedZk2TestBase extends AbstractFullDi
// expire a session...
CloudJettyRunner cloudJetty = shardToJetty.get(SHARD1).get(0);
chaosMonkey.expireSession(cloudJetty.jetty);
+ // Wait until the jetty is reconnected, otherwise the following index command could fail
+ cloudJetty
+ .jetty
+ .getCoreContainer()
+ .getZkController()
+ .getZkClient()
+ .getCuratorFramework()
+ .blockUntilConnected(50, TimeUnit.MILLISECONDS);
indexr("id", docId + 1, t1, "slip this doc in");