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

8299075: TestStringDeduplicationInterned.java fails because extra deduplication #14005

Closed
wants to merge 2 commits into from

Conversation

stefank
Copy link
Member

@stefank stefank commented May 16, 2023

The tests assumes that some strings have not been deduplicated and checks for that. Unfortunately, we can have concurrently triggered GCs that invalidate those checks. I kept the call sites to show the intention of the test, but then I added a comment explaining why those checks are invalid.


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-8299075: TestStringDeduplicationInterned.java fails because extra deduplication

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14005

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 16, 2023

👋 Welcome back stefank! 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 openjdk bot added the rfr Pull request is ready for review label May 16, 2023
@openjdk
Copy link

openjdk bot commented May 16, 2023

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

  • hotspot-gc

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 hotspot-gc hotspot-gc-dev@openjdk.org label May 16, 2023
@mlbridge
Copy link

mlbridge bot commented May 16, 2023

Webrevs

Copy link

@kimbarrett kimbarrett 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. One comment nit.

@@ -410,6 +405,15 @@ public static void main(String[] args) {
System.out.println("End: InternedTest");
}

private static void checkNotDeduplicated(Object value1, Object value2) {
// Note that the following check is invalid since a concurrent GC

Choose a reason for hiding this comment

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

I think the word "concurrent" can be dropped - it seems like any GC could trip over the problem.
It's just that the STW GCs are unlikely to occur and trip this because the various forceDeduplication
calls force GCs at those points, making automatically triggered GCs elsewhere unlikely.

@openjdk
Copy link

openjdk bot commented May 16, 2023

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

8299075: TestStringDeduplicationInterned.java fails because extra deduplication

Reviewed-by: kbarrett, tschatzl

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

  • 316bc79: 8308188: ProblemList java/util/concurrent/locks/Lock/OOMEInAQS.java with ZGC on all platforms
  • 8686a36: 8307315: Missing ResourceMark in CDS and JVMTI code
  • 23cbb2d: 8306860: Avoid unnecessary allocation in List.map() when list is empty
  • be54b54: 8307369: Add execution of all svc tests in CI
  • 19c8c30: 8305634: Renaming predicates, simple cleanups, and adding summary about current predicates
  • 72294c5: 8308024: HttpClient (HTTP/1.1) sends an extraneous empty chunk if the BodyPublisher supplies an empty buffer

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 added the ready Pull request is ready to be integrated label May 16, 2023
@stefank
Copy link
Member Author

stefank commented May 16, 2023

Thanks for the review! I'd like to get this pushed ASAP since it intermittently fails in tier2.

@stefank
Copy link
Member Author

stefank commented May 16, 2023

I'm going to integrate this now. Thanks!
/integrate

@openjdk
Copy link

openjdk bot commented May 16, 2023

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

  • 9d5bab1: 8300081: Replace NULL with nullptr in share/asm/
  • 41ee125: 8278411: Implement UseHeavyMonitors consistently, s390 port
  • 316bc79: 8308188: ProblemList java/util/concurrent/locks/Lock/OOMEInAQS.java with ZGC on all platforms
  • 8686a36: 8307315: Missing ResourceMark in CDS and JVMTI code
  • 23cbb2d: 8306860: Avoid unnecessary allocation in List.map() when list is empty
  • be54b54: 8307369: Add execution of all svc tests in CI
  • 19c8c30: 8305634: Renaming predicates, simple cleanups, and adding summary about current predicates
  • 72294c5: 8308024: HttpClient (HTTP/1.1) sends an extraneous empty chunk if the BodyPublisher supplies an empty buffer

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 16, 2023

@stefank Pushed as commit 682359c.

💡 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
hotspot-gc hotspot-gc-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants