You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mk...@apache.org on 2019/06/30 06:47:47 UTC
[lucene-solr] branch branch_8x updated: SOLR-13577: wait jetty to
stop as @hossman advised.
This is an automated email from the ASF dual-hosted git repository.
mkhl pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new 9b515de SOLR-13577: wait jetty to stop as @hossman advised.
9b515de is described below
commit 9b515deb64ab886131367eb21cb02513b435cd95
Author: Mikhail Khludnev <mk...@apache.org>
AuthorDate: Sun Jun 30 09:45:35 2019 +0300
SOLR-13577: wait jetty to stop as @hossman advised.
---
.../src/test/org/apache/solr/handler/TestReplicationHandler.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
index d608a56..797f0a7 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
@@ -66,6 +66,7 @@ import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
+import org.apache.solr.common.util.TimeSource;
import org.apache.solr.core.CachingDirectoryFactory;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore;
@@ -73,6 +74,7 @@ import org.apache.solr.core.StandardDirectoryFactory;
import org.apache.solr.core.snapshots.SolrSnapshotMetaDataManager;
import org.apache.solr.util.FileUtils;
import org.apache.solr.util.TestInjection;
+import org.apache.solr.util.TimeOut;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -675,6 +677,11 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
masterJetty.stop();
+ final TimeOut waitForLeaderToShutdown = new TimeOut(300, TimeUnit.SECONDS, TimeSource.NANO_TIME);
+ waitForLeaderToShutdown.waitFor
+ ("Gave up after waiting an obscene amount of time for leader to shut down",
+ () -> masterJetty.isStopped() );
+
for(int retries=0; ;retries++) {
Thread.yield(); // might not be necessary at all