Skip to content

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

Closed
wants to merge 3 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Aug 14, 2025

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

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8343855 needs maintainer approval

Issue

  • JDK-8343855: HTTP/2 ConnectionWindowUpdateSender may miss some unprocessed DataFrames from closed streams (Bug - P3 - Approved)

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 14, 2025

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Aug 14, 2025

@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:

8343855: HTTP/2 ConnectionWindowUpdateSender may miss some unprocessed DataFrames from closed streams

Reviewed-by: phh, rschmelter

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 master branch:

  • 56e1f4b: 8352860: Open source events tests batch0
  • c8d4778: 8353126: Open source events tests batch1
  • 56759b9: 8341370: Test java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java fails intermittently on macOS-aarch64

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot changed the title Backport bd6152f5967107d7b32db9bcfa224fc07314f098 8343855: HTTP/2 ConnectionWindowUpdateSender may miss some unprocessed DataFrames from closed streams Aug 14, 2025
@openjdk
Copy link

openjdk bot commented Aug 14, 2025

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Aug 14, 2025
@mlbridge
Copy link

mlbridge bot commented Aug 14, 2025

Webrevs

@GoeLin GoeLin force-pushed the goetz_backport_8343855 branch from b159927 to 8455fa8 Compare August 14, 2025 13:11
@openjdk
Copy link

openjdk bot commented Aug 14, 2025

@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.

@openjdk
Copy link

openjdk bot commented Aug 14, 2025

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

Copy link
Contributor

@schmelter-sap schmelter-sap left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@GoeLin
Copy link
Member Author

GoeLin commented Aug 15, 2025

Thanks for the reviews!

@openjdk openjdk bot added approval Requires approval; will be removed when approval is received ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Aug 15, 2025
@GoeLin
Copy link
Member Author

GoeLin commented Aug 19, 2025

/integrate

@openjdk
Copy link

openjdk bot commented Aug 19, 2025

Going to push as commit 9b71cd6.
Since your change was applied there have been 3 commits pushed to the master branch:

  • 56e1f4b: 8352860: Open source events tests batch0
  • c8d4778: 8353126: Open source events tests batch1
  • 56759b9: 8341370: Test java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java fails intermittently on macOS-aarch64

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 19, 2025
@openjdk openjdk bot closed this Aug 19, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 19, 2025
@openjdk
Copy link

openjdk bot commented Aug 19, 2025

@GoeLin Pushed as commit 9b71cd6.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Port of a pull request already in a different code base integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants