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

8336926: jdk/internal/util/ReferencedKeyTest.java can fail with ConcurrentModificationException #916

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Aug 13, 2024

Clean backport to fix potential CME in ReferencedKeyMap.

Additional testing:

  • MacOS AArch64 server fastdebug, jdk/internal/util java/lang/invoke

Progress

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

Issue

  • JDK-8336926: jdk/internal/util/ReferencedKeyTest.java can fail with ConcurrentModificationException (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 916

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 13, 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.

@openjdk
Copy link

openjdk bot commented Aug 13, 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:

8336926: jdk/internal/util/ReferencedKeyTest.java can fail with ConcurrentModificationException

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

  • 846962d: 8334078: RISC-V: TestIntVect.java fails after JDK-8332153 when running without RVV
  • cd5ac19: 8299813: java/nio/channels/DatagramChannel/Disconnect.java fails with jtreg test timeout due to lost datagram
  • 4c86bf5: 8309067: gtest/AsyncLogGtest.java fails again in stderrOutput_vm
  • ed77abd: 8331572: Allow using OopMapCache outside of STW GC phases
  • fee2094: 8330520: linux clang build fails in os_linux.cpp with static_assert with no message is a C++17 extension
  • 4e84d4d: 8310683: Refactor StandardCharset/standard.java to use JUnit
  • 9b331b0: 8317738: CodeCacheFullCountTest failed with "VirtualMachineError: Out of space in CodeCache for method handle intrinsic"
  • e7e92e0: 8325022: Incorrect error message on client authentication
  • d85b7c1: 8331153: JFR: Improve logging of jdk/jfr/api/consumer/filestream/TestOrdered.java
  • a3cd6d6: 8321206: Make Locale related system properties StaticProperty
  • ... and 20 more: https://git.openjdk.org/jdk21u-dev/compare/d5782215b5ca3befd58d8029e67fd447b26bfa79...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 bfb75b96266f4c5840e2edea13f9aa2c801518cf 8336926: jdk/internal/util/ReferencedKeyTest.java can fail with ConcurrentModificationException Aug 13, 2024
@openjdk
Copy link

openjdk bot commented Aug 13, 2024

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

@openjdk
Copy link

openjdk bot commented Aug 13, 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 Aug 13, 2024
@mlbridge
Copy link

mlbridge bot commented Aug 13, 2024

Webrevs

@shipilev
Copy link
Member Author

/approval request Clean backport to fix CME in ReferencedKeyMap. Applies cleanly. Tests pass. Risk is on lower side, as the change is pretty simple.

@openjdk
Copy link

openjdk bot commented Aug 13, 2024

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

@openjdk openjdk bot added the approval label Aug 13, 2024
@jerboaa
Copy link
Contributor

jerboaa commented Aug 22, 2024

OK, on the basis that this is pretty new class which does not have many usages yet.

/approve yes

@openjdk
Copy link

openjdk bot commented Aug 22, 2024

@jerboaa
8336926: The approval request has been approved.

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

Yes, thank you.

/integrate

@openjdk
Copy link

openjdk bot commented Aug 22, 2024

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

  • 846962d: 8334078: RISC-V: TestIntVect.java fails after JDK-8332153 when running without RVV
  • cd5ac19: 8299813: java/nio/channels/DatagramChannel/Disconnect.java fails with jtreg test timeout due to lost datagram
  • 4c86bf5: 8309067: gtest/AsyncLogGtest.java fails again in stderrOutput_vm
  • ed77abd: 8331572: Allow using OopMapCache outside of STW GC phases
  • fee2094: 8330520: linux clang build fails in os_linux.cpp with static_assert with no message is a C++17 extension
  • 4e84d4d: 8310683: Refactor StandardCharset/standard.java to use JUnit
  • 9b331b0: 8317738: CodeCacheFullCountTest failed with "VirtualMachineError: Out of space in CodeCache for method handle intrinsic"
  • e7e92e0: 8325022: Incorrect error message on client authentication
  • d85b7c1: 8331153: JFR: Improve logging of jdk/jfr/api/consumer/filestream/TestOrdered.java
  • a3cd6d6: 8321206: Make Locale related system properties StaticProperty
  • ... and 20 more: https://git.openjdk.org/jdk21u-dev/compare/d5782215b5ca3befd58d8029e67fd447b26bfa79...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 22, 2024

@shipilev Pushed as commit affb895.

💡 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