This is an automated email from the ASF dual-hosted git repository.
dsmiley 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 5bbf003545d JettySolrRunner: catch TimeoutException from Jetty 12
graceful shutdown (#4220)
5bbf003545d is described below
commit 5bbf003545d7aa0b2eced3a153a8aebbe6d442e3
Author: David Smiley <[email protected]>
AuthorDate: Tue Mar 17 20:17:42 2026 -0400
JettySolrRunner: catch TimeoutException from Jetty 12 graceful shutdown
(#4220)
Co-authored-by: Claude Opus 4.6 <[email protected]>
---
.../src/java/org/apache/solr/embedded/JettySolrRunner.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
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.java
index 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 away
while (!qtp.isStopped()) {
