diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java index f646238c212..ef28807ca85 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java @@ -160,6 +160,13 @@ public class ChaosMonkeySafeLeaderTest extends AbstractFullDistribZkTestBase { Thread.sleep(2000); + waitForThingsToLevelOut(180000); + + // even if things were leveled out, a jetty may have just been stopped or something + // we wait again and wait to level out again to make sure the system is not still in flux + + Thread.sleep(3000); + waitForThingsToLevelOut(180000); checkShardConsistency(batchSize == 1, true);