JDK-8300098 : java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java fails with internal timeout when executed with TieredCompilation1/3

[viktorklang-ora]

The proposed fix by @DougLea ensures that the state transition into waiting is retried in the cases where a previous waiter isn't making progress and a new waiter goes into waiting.

---

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-8300098: java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java fails with internal timeout when executed with TieredCompilation1/3

Reviewers

• Jaikiran Pai (@jaikiran - Reviewer)
• Alan Bateman (@AlanBateman - Reviewer)

Contributors

• Doug Lea <dl@openjdk.org>

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12319

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

Using diff file

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

[viktorklang-ora]

/contributor add @DougLea

[bridgekeeper]

👋 Welcome back viktorklang-ora! 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]

@viktorklang-ora
Contributor Doug Lea <dl@openjdk.org> successfully added.

[openjdk]

@viktorklang-ora 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.

[mlbridge]

Webrevs

• 00: Full (d1329736)

[jaikiran]

Hello Viktor, I don't have enough knowledge of this area, but looking at this change and going by what Doug noted in the JBS issue:

There's a CHM bug scenario that I haven't been able to rule out after looking at this again: A late clearing of waiter field in ConcurrentHashMap.contendedLock by a previous waiter. There may be a constraint I've forgotten that makes this impossible in principle, but it is easy to change to be more clearly correct by replacing the writes with CASes

this change looks OK to me.

You might have to add a noreg-hard label to that JBS issue.

[openjdk]

@viktorklang-ora 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:

8300098: java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java fails with internal timeout when executed with TieredCompilation1/3

Co-authored-by: Doug Lea <dl@openjdk.org>
Reviewed-by: jpai, alanb

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

• 7ae447f: 8301095: [s390x] TestDwarf.java fails
• 9c80b8a: 8299683: [S390X] Problems with -XX:+VerifyStack
• 8e9b726: 8301599: Serial: Refactor nested closures in DefNewGeneration
• 7730506: 8299162: Refactor shared trampoline emission logic
• 522fa13: 8301580: Error recovery does not clear returnResult
• 7ac2079: 8301025: ClassCastException in switch with generic record
• 371a0c4: 8301465: Remove unnecessary nmethod arming in Full GC of Serial/Parallel
• 716f1df: 8301478: Replace NULL with nullptr in os/bsd
• ab528ce: 4934362: see also refers to self
• 8f195ff: 8298952: All nodes should have type(n) == Value(n) after IGVN
• ... and 105 more: https://git.openjdk.org/jdk/compare/041a12e65530b5832b4a500180c97a2a60e0dc51...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 (@jaikiran, @AlanBateman) 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).

[viktorklang-ora]

/integrate

[openjdk]

@viktorklang-ora
Your change (at version d132973) is now ready to be sponsored by a Committer.

[AlanBateman]

/sponsor

[openjdk]

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

• 7ae447f: 8301095: [s390x] TestDwarf.java fails
• 9c80b8a: 8299683: [S390X] Problems with -XX:+VerifyStack
• 8e9b726: 8301599: Serial: Refactor nested closures in DefNewGeneration
• 7730506: 8299162: Refactor shared trampoline emission logic
• 522fa13: 8301580: Error recovery does not clear returnResult
• 7ac2079: 8301025: ClassCastException in switch with generic record
• 371a0c4: 8301465: Remove unnecessary nmethod arming in Full GC of Serial/Parallel
• 716f1df: 8301478: Replace NULL with nullptr in os/bsd
• ab528ce: 4934362: see also refers to self
• 8f195ff: 8298952: All nodes should have type(n) == Value(n) after IGVN
• ... and 105 more: https://git.openjdk.org/jdk/compare/041a12e65530b5832b4a500180c97a2a60e0dc51...master

Your commit was automatically rebased without conflicts.

[openjdk]

@AlanBateman @viktorklang-ora Pushed as commit ecf8842.

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