Skip to content

JettySolrRunner: catch TimeoutException from Jetty 12 graceful shutdown #4220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dsmiley merged 1 commit into from
Mar 18, 2026
Merged

JettySolrRunner: catch TimeoutException from Jetty 12 graceful shutdown #4220

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
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;
Expand Down Expand Up @@ -676,7 +677,11 @@ public synchronized void stop() throws Exception {
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()) {
Expand Down
Loading