Apache Solr open-source search software
JettySolrRunner: catch TimeoutException from Jetty 12 graceful shutdown (#4220)
David Smiley5bbf003545d7
diff --git a/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.javaindex 7bf21d54964..05405b37d3c 100644--- a/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java+++ b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java@@ -49,6 +49,7 @@ import java.util.Properties;import java.util.Random;import java.util.Set;import java.util.concurrent.TimeUnit;+import java.util.concurrent.TimeoutException;import java.util.concurrent.atomic.AtomicInteger;import java.util.concurrent.atomic.AtomicLong;import org.apache.solr.client.solrj.SolrClient;@@ -683,7 +684,11 @@ public class JettySolrRunner {QueuedThreadPool qtp = (QueuedThreadPool) server.getThreadPool();ReservedThreadExecutor rte = qtp.getBean(ReservedThreadExecutor.class);- server.stop();+ try {+ server.stop();+ } catch (TimeoutException e) {+ log.warn("Jetty server graceful stop timed out; proceeding with forceful cleanup", e);+ }// stop timeout is 0, so we will interrupt right awaywhile (!qtp.isStopped()) {