Repository navigation
Conversation
Jetty 12.1.14 fixes the HTTP/2 client regression (jetty/jetty.project#15368) that truncated in-flight responses during graceful shutdown, so TestGracefulJettyShutdown is re-enabled.
github-actions
Bot
added
documentation
Contributor
Author
Contributor
Author
|
@dsmiley Cleared the milestone flag as the backport requires cherry-pick in order of two other main-only commits. If all those three PRs are given the 10.x milestone at the same time, I'm sure your backport black-magic will sort out the ordering, and perhaps even peek at my backporting comment in the description of this PR. But for now, keeping it manual. |
janhoy
commented
Oct 8, 2026
| import org.slf4j.LoggerFactory; | ||
|
|
||
| @Ignore("Flaky from Jetty 12.1.10 upgrade https://issues.apache.org/jira/browse/SOLR-18297") | ||
| public class TestGracefulJettyShutdown extends SolrTestCaseJ4 { |
Contributor
Author
There was a problem hiding this comment.
I'd say we make this test @Nightly since its main purpose was to validate the jetty fix.
And this test should probably extend SolrTestCase, not the J4 one... That's a minor..
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Jetty 12.1.14 fixes the HTTP/2 client regression (jetty/jetty.project#15368) that truncated in-flight responses during graceful shutdown, so TestGracefulJettyShutdown is re-enabled.
Targeting 10.1 for now. If it turns out that this will target 10.2, move the release-note section in ref-guide
For information: We previously upgraded to 12.1.10 in #4574 under same JIRA id, since 12.1.10 was main-only until now.
https://issues.apache.org/jira/browse/SOLR-18297
Verification (main)
Backporting to branch_10x
Cherry-pick, in order: bb8c68b (#4574), b4d85ed (#4664), then the commit from this PR. Expected conflicts in #4574:
libs.versions.toml(keep 10x's ecj line, take the Jetty line),HttpJettySolrClient.java(keep 10x; the hunk is obsolete after #4668),HttpSolrProxyTest.java(keep 10x; it already came with #4760),solr-jetty-context.xml(delete), and the major-changes page (insert the Jetty section before "Testing Framework"). All lockfile conflicts resolve by running./gradlew resolveAndLockAll --write-locks && ./gradlew updateLicensesafter each cherry-pick; keep the existingdev.cel0.13.1 pin insolr/modules/gcs-repository/gradle.lockfile. #4845 (12.1.12) can be skipped.