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 #66

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/jdk23u.git pull/66/head:pull/66
$ git checkout pull/66

Update a local copy of the PR:
$ git checkout pull/66
$ git pull https://git.openjdk.org/jdk23u.git pull/66/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 66

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk23u/pull/66.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 7 new commits pushed to the master branch:

  • ed24b9e: 8028127: Regtest java/security/Security/SynchronizedAccess.java is incorrect
  • de9f5ed: 8336342: Fix known X11 library locations in sysroot
  • 677c18e: 8337283: configure.log is truncated when build dir is on different filesystem
  • d6046d8: 8336343: Add more known sysroot library locations for ALSA
  • fd4f330: 8332113: Update nsk.share.Log to be always verbose
  • 2820768: 8336315: tools/jpackage/windows/WinChildProcessTest.java Failed: Check is calculator process is alive
  • 66fb62a: 8336928: GHA: Bundle artifacts removal broken

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 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 approval ready Pull request is ready to be integrated and removed approval labels Aug 13, 2024
@shipilev
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 19, 2024

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

  • 045c990: 8335007: Inline OopMapCache table
  • 5098e8c: Merge
  • 6f582f4: 8337831: Remove EA from the JDK 23 version string with first RC promotion
  • b7ede41: 8337716: ByteBuffer hashCode implementations are inconsistent
  • 2eb7709: 8337054: JDK 23 RDP2 L10n resource files update
  • 946c6cc: 8334167: Test java/lang/instrument/NativeMethodPrefixApp.java timed out
  • 6a6591e: 8335967: "text-decoration: none" does not work with "A" HTML tags
  • 4e56ca5: 8338058: map_or_reserve_memory_aligned Windows enhance remap assertion
  • b82bbae: 8337971: Problem list several jvmci tests on linux-riscv64 until JDK-8331704 is fixed
  • afba2b3: 8337810: ProblemList BasicDirectoryModel/LoaderThreadCount.java on Windows
  • ... and 7 more: https://git.openjdk.org/jdk23u/compare/e008338747a5d601d3bc63b01282f06a16bedd06...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 19, 2024

@shipilev Pushed as commit 2369d92.

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

1 participant