You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/07/09 21:01:53 UTC

[lucene-solr] 11/23: fix jetty stop for non solrcloudtest tests.

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

markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit d5f22c18c6c3de301d658cf2b589578e5d51f546
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Wed Jul 8 11:23:03 2020 -0500

    fix jetty stop for non solrcloudtest tests.
---
 .../java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
index 193d5f2..2cbbedf 100644
--- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
+++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
@@ -301,14 +301,14 @@ public class JettySolrRunner implements Closeable {
       qtp.setLowThreadsThreshold(Integer.getInteger("solr.lowContainerThreadsThreshold", -1)); // we don't use this or connections will get cut
       qtp.setMinThreads(Integer.getInteger("solr.minContainerThreads", 3));
       qtp.setIdleTimeout(Integer.getInteger("solr.containerThreadsIdle", THREAD_POOL_MAX_IDLE_TIME_MS));
-      qtp.setStopTimeout((int) TimeUnit.MINUTES.toMillis(2));
+      qtp.setStopTimeout(1);
       qtp.setReservedThreads(-1); // -1 auto sizes, important to keep
     }
 
     server = new Server(qtp);
 
 
-    server.setStopTimeout((int) TimeUnit.MINUTES.toMillis(2)); // will wait gracefull for stoptime / 2, then interrupts
+    server.setStopTimeout(1); // will wait gracefull for stoptime / 2, then interrupts
     assert config.stopAtShutdown;
     server.setStopAtShutdown(config.stopAtShutdown);