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

8325255: jdk.internal.util.ReferencedKeySet::add using wrong test #557

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented May 7, 2024

Clean backport, follow up for recent JDK-8310913 integration. Nothing AFAICS is using the affected method except the test itself.

Additional testing:

  • New regression test fails without the fix, passes with it

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8325255 needs maintainer approval

Issue

  • JDK-8325255: jdk.internal.util.ReferencedKeySet::add using wrong test (Bug - P3 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 557

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 7, 2024

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

@shipilev
Copy link
Member Author

shipilev commented May 7, 2024

/approval request Follow up for recent JDK-8310913 integration. Applies cleanly, regression test is sensitive to the bug. Nothing else is using the affected method in JDK 21, so risk is low.

@openjdk
Copy link

openjdk bot commented May 7, 2024

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

8325255: jdk.internal.util.ReferencedKeySet::add using wrong test

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

  • 5b5d778: 8309871: jdk/jfr/api/consumer/recordingstream/TestSetEndTime.java timed out
  • 035e314: 8324243: Compilation failures in java.desktop module with gcc 14
  • fbb0f4c: 8311964: Some jtreg tests failing on x86 with error 'unrecognized VM options' (C2 flags)
  • bddd6a7: 8321925: sun/security/mscapi/KeytoolChangeAlias.java fails with "Alias <246810> does not exist"
  • 153de5a: 8320370: NMT: Change MallocMemorySnapshot to simplify code.
  • fa874b3: 8325621: Improve jspawnhelper version checks
  • e3a9226: 8330524: Linux ppc64le compile warning with clang in os_linux_ppc.cpp
  • c12dfc3: 8330523: Reduce runtime and improve efficiency of KeepAliveTest
  • ddecbe5: 8330815: Use pattern matching for instanceof in KeepAliveCache
  • 93d091a: 8314573: G1: Heap resizing at Remark does not take existing eden regions into account
  • ... and 1 more: https://git.openjdk.org/jdk21u-dev/compare/ec6b32601095017a2641f4b82143e83bef5f37b6...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 openjdk bot changed the title Backport a7461de231da20ed78a7c6ad8275f1bafbfa556c 8325255: jdk.internal.util.ReferencedKeySet::add using wrong test May 7, 2024
@openjdk
Copy link

openjdk bot commented May 7, 2024

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

@openjdk
Copy link

openjdk bot commented May 7, 2024

⚠️ @shipilev 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 openjdk bot added the rfr Pull request is ready for review label May 7, 2024
@openjdk
Copy link

openjdk bot commented May 7, 2024

@shipilev
8325255: The approval request has been created successfully.

@openjdk openjdk bot added the approval label May 7, 2024
@mlbridge
Copy link

mlbridge bot commented May 7, 2024

Webrevs

@GoeLin
Copy link
Member

GoeLin commented May 8, 2024

Please have a look at 22....

@shipilev
Copy link
Member Author

shipilev commented May 8, 2024

Please have a look at 22....

Right. I missed that the original JDK-8310913 is in 22. Here: openjdk/jdk22u#189

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

/integrate

@openjdk
Copy link

openjdk bot commented May 15, 2024

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

  • 5b5d778: 8309871: jdk/jfr/api/consumer/recordingstream/TestSetEndTime.java timed out
  • 035e314: 8324243: Compilation failures in java.desktop module with gcc 14
  • fbb0f4c: 8311964: Some jtreg tests failing on x86 with error 'unrecognized VM options' (C2 flags)
  • bddd6a7: 8321925: sun/security/mscapi/KeytoolChangeAlias.java fails with "Alias <246810> does not exist"
  • 153de5a: 8320370: NMT: Change MallocMemorySnapshot to simplify code.
  • fa874b3: 8325621: Improve jspawnhelper version checks
  • e3a9226: 8330524: Linux ppc64le compile warning with clang in os_linux_ppc.cpp
  • c12dfc3: 8330523: Reduce runtime and improve efficiency of KeepAliveTest
  • ddecbe5: 8330815: Use pattern matching for instanceof in KeepAliveCache
  • 93d091a: 8314573: G1: Heap resizing at Remark does not take existing eden regions into account
  • ... and 1 more: https://git.openjdk.org/jdk21u-dev/compare/ec6b32601095017a2641f4b82143e83bef5f37b6...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 15, 2024

@shipilev Pushed as commit 2429a90.

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

Successfully merging this pull request may close these issues.

2 participants