Skip to content
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

8305906: HttpClient may use incorrect key when finding pooled HTTP/2 connection for IPv6 address #2121

Closed

Conversation

jaikiran
Copy link
Member

@jaikiran jaikiran commented Jan 11, 2024

Can I please get a review for this change which backports the fix that was done in https://bugs.openjdk.org/browse/JDK-8305906?

The fix in the source is a clean backport. However, the newly introduced test in mainline uses a test specific libraries which aren't the same in 17u. As a result, the tests test/jdk/java/net/httpclient/http2/ConnectionReuseTest.java had conflicts. I have manually updated relevant parts of that test to make it use the test libraries that are available and applicable in 17u.

I have also verified that the test fails (as expected) if I undo the source change and passes when I re-introduce the source change. Additionally, I have run this test in our CI to verify that it passes.


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-8305906 needs maintainer approval

Issue

  • JDK-8305906: HttpClient may use incorrect key when finding pooled HTTP/2 connection for IPv6 address (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2121

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 11, 2024

👋 Welcome back jpai! 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.

@jaikiran jaikiran changed the title Backport jaikiran 3ccb3c0e 8323666: HttpClient may use incorrect key when finding pooled HTTP/2 connection for IPv6 address Jan 12, 2024
@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 12, 2024
@jaikiran jaikiran changed the title 8323666: HttpClient may use incorrect key when finding pooled HTTP/2 connection for IPv6 address 8305906: HttpClient may use incorrect key when finding pooled HTTP/2 connection for IPv6 address Jan 12, 2024
@openjdk openjdk bot added the approval label Jan 12, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 12, 2024

Webrevs

@jaikiran jaikiran changed the title 8305906: HttpClient may use incorrect key when finding pooled HTTP/2 connection for IPv6 address Backport 3ccb3c0e09f9a414229d3f76031f3fc8f271c936 Jan 12, 2024
@openjdk openjdk bot changed the title Backport 3ccb3c0e09f9a414229d3f76031f3fc8f271c936 8305906: HttpClient may use incorrect key when finding pooled HTTP/2 connection for IPv6 address Jan 12, 2024
@openjdk
Copy link

openjdk bot commented Jan 12, 2024

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

@openjdk openjdk bot added the backport label Jan 12, 2024
@openjdk
Copy link

openjdk bot commented Jan 12, 2024

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

@openjdk
Copy link

openjdk bot commented Jan 15, 2024

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

8305906: HttpClient may use incorrect key when finding pooled HTTP/2 connection for IPv6 address

Reviewed-by: phh

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

  • 77b15bb: 8322098: os::Linux::print_system_memory_info enhance the THP output with /sys/kernel/mm/transparent_hugepage/hpage_pmd_size
  • 33af090: 8322783: prioritize /etc/os-release over /etc/SuSE-release in hs_err/info output
  • e0c7d62: 8325150: (tz) Update Timezone Data to 2024a
  • 17b3857: 8325096: Test java/security/cert/CertPathBuilder/akiExt/AKISerialNumber.java is failing
  • 223018a: 8321480: ISO 4217 Amendment 176 Update
  • fc49554: 8320168: handle setsocktopt return values
  • 4126c01: 8323637: Capture hotspot replay files in GHA
  • 58d2ceb: 8324937: GHA: Avoid multiple test suites per job
  • 44ed380: 8310923: Refactor Currency tests to use JUnit
  • 8364974: 8280241: (aio) AsynchronousSocketChannel init fails in IPv6 only Windows env
  • ... and 67 more: https://git.openjdk.org/jdk17u-dev/compare/20fdc05b0b1b101687f0c6ad538fb85af9ca9c67...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@phohensee) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Jan 15, 2024
@GoeLin
Copy link
Member

GoeLin commented Jan 29, 2024

Hi @jaikiran, you might want to re-run the GHA tests.

@jaikiran
Copy link
Member Author

Hello @GoeLin, I'm running some internal CI tests as well and I have a change in the works for (only) the test. I'll update this PR with that change soon and rerun the GitHub jobs as well.

@jaikiran
Copy link
Member Author

Hello Paul @phohensee, would you mind reviewing this again? The test has been updated to be a bit more robust based on what we had seen internally in our CI.

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

Lgtm. GHA failure is infra-related.

@jaikiran
Copy link
Member Author

Thank you Paul.
/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Feb 15, 2024
@openjdk
Copy link

openjdk bot commented Feb 15, 2024

@jaikiran
Your change (at version 0fbf00c) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Feb 16, 2024

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

  • 200c2a0: 8290203: ProblemList vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/TestDescription.java on linux-all
  • d9b412e: 8318603: Parallelize sun/java2d/marlin/ClipShapeTest.java
  • a234b7c: 8324514: ClassLoaderData::print_on should print address of class loader
  • 77b15bb: 8322098: os::Linux::print_system_memory_info enhance the THP output with /sys/kernel/mm/transparent_hugepage/hpage_pmd_size
  • 33af090: 8322783: prioritize /etc/os-release over /etc/SuSE-release in hs_err/info output
  • e0c7d62: 8325150: (tz) Update Timezone Data to 2024a
  • 17b3857: 8325096: Test java/security/cert/CertPathBuilder/akiExt/AKISerialNumber.java is failing
  • 223018a: 8321480: ISO 4217 Amendment 176 Update
  • fc49554: 8320168: handle setsocktopt return values
  • 4126c01: 8323637: Capture hotspot replay files in GHA
  • ... and 70 more: https://git.openjdk.org/jdk17u-dev/compare/20fdc05b0b1b101687f0c6ad538fb85af9ca9c67...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Feb 16, 2024
@openjdk openjdk bot closed this Feb 16, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Feb 16, 2024
@openjdk
Copy link

openjdk bot commented Feb 16, 2024

@phohensee @jaikiran Pushed as commit 4395668.

💡 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 integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants