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.

Sign up for GitHub

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

Jump to bottom

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

Closed
wants to merge 1 commit into from
Closed

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

wants to merge 1 commit into from

Conversation

RogerRiggs
Copy link
Contributor

@RogerRiggs RogerRiggs commented Aug 7, 2024 •
edited by openjdk bot
Loading

The original test fails intermittently, the reproducer failed consistently.
With the fix, the failure was not observed in the test or reproducer.

In jdk.internal.util.ReferencedKeyMap.entrySet() and toString() methods, avoid removing stale references that would modify the keyset while it is being iterated over.
If GC removes the key, iterating or streaming over the keyset might get a ConcurrentModificationException.

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

Issue

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

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/20499/head:pull/20499
$ git checkout pull/20499

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 20499

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/20499.diff

Webrev

Link to Webrev Comment

@RogerRiggs
8336926: jdk/internal/util/ReferencedKeyTest.java can fail with Concu…
559b504 
…rrentModificationException

In ReferencedKeyMap.entrySet and toString, avoid removing stale references that would modify the keyset.
If GC, removes the key, iterating or streaming over the keyset might get a ConcurrentModificationException.
@bridgekeeper
Copy link

bridgekeeper bot commented Aug 7, 2024

👋 Welcome back rriggs! 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 7, 2024 •
edited
Loading

@RogerRiggs 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

Reviewed-by: bpb, shade, dfuchs

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

  • 4b740d8: 8225209: jdk/jfr/event/compiler/TestCodeSweeper.java fails
  • ddbd7a7: 8337320: Update ProblemList.txt with tests known to fail on XWayland
  • 12c553f: 8329471: Remove GTK2
  • 088871c: 8335267: [XWayland] move screencast tokens from .awt to .java folder
  • 3bc4a1a: 8233068: HIDPI: Linux: AWT Checkbox check mark is unscaled
  • a9460a6: 8337982: Remove dead undef assrt0n
  • fa18359: 8335981: ProblemList runtime/Thread/TestAlwaysPreTouchStacks.java for MacOS
  • 1846a65: 8337205: Typo in Stack vs Deque Method table in Deque specification
  • 16df9c3: 8337971: Problem list several jvmci tests on linux-riscv64 until JDK-8331704 is fixed
  • 9b11bd7: 8337826: Improve logging in OCSPTimeout and SimpleOCSPResponder to help diagnose JDK-8309754
  • ... and 4 more: https://git.openjdk.org/jdk/compare/21f710e7f6698b12b06cc3685cefa31f5fcff2a2...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 added the rfr Pull request is ready for review label Aug 7, 2024
@openjdk
Copy link

openjdk bot commented Aug 7, 2024

@RogerRiggs The following label will be automatically applied to this pull request:

  • core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Aug 7, 2024
@mlbridge
Copy link

mlbridge bot commented Aug 7, 2024

Webrevs

bplb
bplb approved these changes Aug 7, 2024
View reviewed changes
Copy link
Member

@bplb bplb left a comment

Choose a reason for hiding this comment

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

Looks reasonable.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 7, 2024
@jaikiran jaikiran mentioned this pull request Aug 8, 2024
Closed
3 tasks
shipilev
shipilev approved these changes Aug 8, 2024
View reviewed changes
Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Looks good. Comprehension check: only the methods that call back to ReferencedKeyMap.get are affected. So methods like filterKeySet itself are not affected, because they do ReferenceKey::get, not ReferenceKeyMap::get.

shipilev
shipilev suggested changes Aug 8, 2024
View reviewed changes
Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Wait a sec, I think this PR should include the un-problemlisting, e.g. reverting #20488?

@jaikiran
Copy link
Member

jaikiran commented Aug 8, 2024

Hello Aleksey,

Wait a sec, I think this PR should include the un-problemlisting, e.g. reverting #20488?

#20488 wasn't integrated and was instead closed in favour of this current PR.

shipilev
shipilev approved these changes Aug 8, 2024
View reviewed changes
Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

All right then. I got confused by the PR status.

dfuch
dfuch approved these changes Aug 8, 2024
View reviewed changes
Copy link
Member

@dfuch dfuch left a comment •
edited
Loading

Choose a reason for hiding this comment

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

The proposed changes look reasonable to me. Those seem to be the only methods where removeStaleReferences() could have been indirectly called while looping over the entries.

@RogerRiggs
Copy link
Contributor Author

The robustness of the non-collecting parts of the test as suggested in the Jira comments is covered by a new issue JDK-8338060.

@RogerRiggs
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 8, 2024

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 8, 2024

@RogerRiggs Pushed as commit bfb75b9.

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

@RogerRiggs RogerRiggs deleted the 8336926-referenced-key-map branch November 27, 2024 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bplb bplb bplb approved these changes

@dfuch dfuch dfuch approved these changes

@shipilev shipilev shipilev approved these changes

Assignees
No one assigned
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@RogerRiggs @jaikiran @shipilev @dfuch @bplb