8342075: HttpClient: improve HTTP/2 flow control checks

[alexeybakhtin]

Please review the backport of JDK-8342075

Almost clean backport except for the import section of src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java

Requires JDK-8317808 [1] as a prerequisite to fixing the hanging of the new tests.

All jtreg tests for java.net.httpclient are passed

[1] - #1426
[2] - openjdk/jdk@720b446#diff-c18c2a070038409f25c08e13c174a95f33840e2deddcc29f6d8306de572a618b

---

Progress

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

Issues

• JDK-8342075: HttpClient: improve HTTP/2 flow control checks (Bug - P4 - Approved)
• JDK-8350602: HttpClient: improve HTTP/2 flow control checks (CSR)

Reviewers

• Andrew John Hughes (@gnu-andrew - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/1428/head:pull/1428
$ git checkout pull/1428

Update a local copy of the PR:
$ git checkout pull/1428
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/1428/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1428

View PR using the GUI difftool:
$ git pr show -t 1428

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/1428.diff

Using Webrev

Link to Webrev Comment

[bridgekeeper]

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

[openjdk]

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

8342075: HttpClient: improve HTTP/2 flow control checks

Reviewed-by: andrew

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 12 new commits pushed to the master branch:

• 8ed020e: 8350786: Some java/lang jtreg tests miss requires vm.hasJFR
• f3112ef: 8352302: Test sun/security/tools/jarsigner/TimestampCheck.java is failing
• 3d6562b: 8348110: Update LCMS to 2.17
• a3b2421: 8280991: [XWayland] No displayChanged event after setDisplayMode call
• c7bcdb6: 8345598: Upgrade NSS binaries for interop tests
• 0c08a0c: 8350260: Improve HTML instruction formatting in PassFailJFrame
• dfbe834: 8294155: Exception thrown before awaitAndCheck hangs PassFailJFrame
• 17973ad: 8342524: Use latch in AbstractButton/bug6298940.java instead of delay
• e985f85: 8343529: serviceability/sa/ClhsdbWhere.java fails AssertionFailure: Corrupted constant pool
• 0306b9d: 8343936: Adjust timeout in test javax/management/monitor/DerivedGaugeMonitorTest.java
• ... and 2 more: https://git.openjdk.org/jdk21u-dev/compare/c874b46eb5b2f2742d9e55baa2e582958503a954...master

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]

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

[openjdk]

At least one of the issues associated with this backport has a resolved CSR for a different version. As this means that this backport may also need a CSR, the csr label is being added to this pull request to signal this potential requirement. The command /csr unneeded can be used to remove the label in case a CSR is not needed.

[mlbridge]

Webrevs

• 03: Full (8b0b0fd6)
• 02: Full - Incremental (247e11ea)
• 01: Full - Incremental (ec9d0ca6)
• 00: Full (ec9d0ca6)

[openjdk-notifier]

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout JDK-8342075-v1
git fetch https://git.openjdk.org/jdk21u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

[alexeybakhtin]

CSR is submitted : https://bugs.openjdk.org/browse/JDK-8350611

[gnu-andrew]

Code backport looks good (and matches what I started doing myself with resolving the import).

With the test changes, was there a reason for abandoning #1416 & #1417 and including the test changes in this patch? It looks like they are both in 21.0.8-oracle

[alexeybakhtin]

At the time of backport creation, JDK-8315181 was not integrated into Oracle 21.0.8 yet. This is why I decided to make a patch without it, especially because JDK-8315181 is required for tests only.
Now JDK-8315181 is integrated into Oracle and I reopened #1416 & #1417 backports.
I will rebase this patch as soon as #1417 is accepted

[gnu-andrew]

At the time of backport creation, JDK-8315181 was not integrated into Oracle 21.0.8 yet. This is why I decided to make a patch without it, especially because JDK-8315181 is required for tests only. Now JDK-8315181 is integrated into Oracle and I reopened #1416 & #1417 backports. I will rebase this patch as soon as #1417 is accepted

Thanks. Sorry for messing you about, but if we're going to have those two in 21u, I think it makes sense to do them in order.

[alexeybakhtin]

@gnu-andrew
I have rebased the PR to the latest master.
The backport is almost clean now, except for the import section in Http2Connection.java. This section was added by JDK-8310330 in JDK22 but not backported.
I have removed test changes from the initial description as soon as they are in the master already.
All related jtreg tests are passed

[alexeybakhtin]

CSR JDK-8350602 for JDK21 is approaved

[gnu-andrew]

CSR JDK-8350602 for JDK21 is approaved

Yes, I just linked that one to JDK-8350610 in place of the withdrawn one.

[gnu-andrew]

Thanks for handling the pre-requisites. Patch looks good. Please apply for approval.

[openjdk]

⚠️ @alexeybakhtin 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.

[gnu-andrew]

/approve yes

[openjdk]

@gnu-andrew
8342075: The approval request has been approved.

[alexeybakhtin]

/integrate

[openjdk]

Going to push as commit 32ac3e7.
Since your change was applied there have been 12 commits pushed to the master branch:

• 8ed020e: 8350786: Some java/lang jtreg tests miss requires vm.hasJFR
• f3112ef: 8352302: Test sun/security/tools/jarsigner/TimestampCheck.java is failing
• 3d6562b: 8348110: Update LCMS to 2.17
• a3b2421: 8280991: [XWayland] No displayChanged event after setDisplayMode call
• c7bcdb6: 8345598: Upgrade NSS binaries for interop tests
• 0c08a0c: 8350260: Improve HTML instruction formatting in PassFailJFrame
• dfbe834: 8294155: Exception thrown before awaitAndCheck hangs PassFailJFrame
• 17973ad: 8342524: Use latch in AbstractButton/bug6298940.java instead of delay
• e985f85: 8343529: serviceability/sa/ClhsdbWhere.java fails AssertionFailure: Corrupted constant pool
• 0306b9d: 8343936: Adjust timeout in test javax/management/monitor/DerivedGaugeMonitorTest.java
• ... and 2 more: https://git.openjdk.org/jdk21u-dev/compare/c874b46eb5b2f2742d9e55baa2e582958503a954...master

Your commit was automatically rebased without conflicts.

[openjdk]

@alexeybakhtin Pushed as commit 32ac3e7.

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