-
Notifications
You must be signed in to change notification settings - Fork 227
8343855: HTTP/2 ConnectionWindowUpdateSender may miss some unprocessed DataFrames from closed streams #3852
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.
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
Conversation
👋 Welcome back goetz! A progress list of the required criteria for merging this PR into |
@GoeLin This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 3 new commits pushed to the
Please see this link for an up-to-date comparison between the source branch of this pull request and the ➡️ To integrate this PR with the above commit message to the |
This backport pull request has now been updated with issue from the original commit. |
Webrevs
|
b159927
to
8455fa8
Compare
@GoeLin Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information. |
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good.
Thanks for the reviews! |
/integrate |
Going to push as commit 9b71cd6.
Your commit was automatically rebased without conflicts. |
I backport this for parity with 17.0.17-oracle.
Also, it is a follow-up to JDK-8342075: HttpClient: improve HTTP/2 flow control checks.
It needed resolves and adaptions:
Resolved the first chunk in Stream.java which adds the declaration of inputQLock.
The declaraions in the context have been modified by
8308310: HttpClient: Avoid logging or locking from within synchronized blocks.
Omitted one chunk fixing white space.
See first commit.
Adaptions can be found in the second commit.
The change uses locks from 8308310 and introduces a new lock.
To make this work further adaptions are needed (see extra commit):
I add edimports required by the new lock inputQLock.
stateLock is used by this change, but only introduced by JDK-8308310.
Where 21 uses stateLock, the implementation in 17 locks
itself ("this"). I changed the use of stateLock introduced
by this change in pushDateaFrame() accordingly.
Actually, 17 declares a row of methods as synchronized
that are not handled by stateLock in 21, e.g. isCanceled().
So there is a difference in behavior wrt. this lock
between 17 and 21.
I needed to fix two build issues in StreamFlowControlTest.java:
.../test/jdk/java/net/httpclient/http2/StreamFlowControlTest.java:299: error: incompatible types: try-with-resources not applicable to variable type
try (var client = HttpClient.newBuilder().sslContext(sslContext).build()) {
^
(HttpClient cannot be converted to AutoCloseable)
/.../test/jdk/java/net/httpclient/http2/StreamFlowControlTest.java:300: error: cannot find symbol
var request = HttpRequest.newBuilder(URI.create(h2Head)).HEAD().build();
^
symbol: method HEAD()
location: interface Builder
The first I resolved similar to other places in this test in the backport that
brought the test to 17: 073bb3d
Thanks to Aleksey for this detail.
For the second issue I replaced HEAD() by it's implementation.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/3852/head:pull/3852
$ git checkout pull/3852
Update a local copy of the PR:
$ git checkout pull/3852
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/3852/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 3852
View PR using the GUI difftool:
$ git pr show -t 3852
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/3852.diff
Using Webrev
Link to Webrev Comment