You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2024/11/01 21:44:28 UTC

(solr) branch main updated: BasicDistributedZk2Test - wait for ZK connection to come back

This is an automated email from the ASF dual-hosted git repository.

houston pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/main by this push:
     new 0f8decddaa1 BasicDistributedZk2Test - wait for ZK connection to come back
0f8decddaa1 is described below

commit 0f8decddaa1a9b84e98b995b2f631dd9ac9684cd
Author: Houston Putman <ho...@apache.org>
AuthorDate: Fri Nov 1 16:44:17 2024 -0500

    BasicDistributedZk2Test - wait for ZK connection to come back
---
 .../apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java    | 8 ++++++++
 1 file changed, 8 insertions(+)

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");