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

Jump to bottom

8278627: Shenandoah: TestHeapDump test failed #58

Closed
wants to merge 2 commits into from
Closed

8278627: Shenandoah: TestHeapDump test failed #58

wants to merge 2 commits into from

Conversation

zhengyu123
Copy link
Contributor

@zhengyu123 zhengyu123 commented Jan 4, 2022 •
edited by openjdk[bot] bot

I would like to backport this patch to 17u, it fixes a potential fatal crash during heap dump.

The original patch does not apply cleanly, due to context differences, e.g. JDK-8273559 and JDK-8268368 do not in 17u.

Test:

  • hotspot_gc_shenandoah

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk17u-dev pull/58/head:pull/58
$ git checkout pull/58

Update a local copy of the PR:
$ git checkout pull/58
$ git pull https://git.openjdk.java.net/jdk17u-dev pull/58/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 58

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk17u-dev/pull/58.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jan 4, 2022

👋 Welcome back zgu! 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 changed the title Backport 1128674d7f3766dda8869b213e1fc629e44ea7a8 8278627: Shenandoah: TestHeapDump test failed Jan 4, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Jan 4, 2022

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

@openjdk openjdk bot added backport rfr labels Jan 4, 2022
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 4, 2022 •
edited

Webrevs

shipilev
shipilev reviewed Jan 5, 2022
View changes
src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp Outdated

void ShenandoahHeapIterationRootScanner::roots_do(OopClosure* oops) {
// Must use _claim_other to avoid interfering with concurrent CLDG iteration
CLDToOopClosure clds(oops, ClassLoaderData::_claim_other);
Copy link
Contributor

@shipilev shipilev Jan 5, 2022

Choose a reason for hiding this comment

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

I am confused a bit. The original code for 17u has ClassLoaderData::_claim_none here, the backport changes it to _claim_other. The JDK 18 had _claim_other both in original code and in the patch. What is going on here?

Copy link
Contributor Author

@zhengyu123 zhengyu123 Jan 5, 2022

Choose a reason for hiding this comment

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

Good catch! _claim_other comes from JDK-8273559. I tried to backport JDK-8273559 as well, but ran into lock rank inversion problem, as grand lock rank reshuffling is not in JDK17u.

shipilev
shipilev approved these changes Jan 5, 2022
View changes
Copy link
Contributor

@shipilev shipilev left a comment

Looks good, thanks!

@openjdk
Copy link

@openjdk openjdk bot commented Jan 5, 2022

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

8278627: Shenandoah: TestHeapDump test failed

Reviewed-by: shade

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

  • ca59b64: 8277342: vmTestbase/nsk/stress/strace/strace004.java fails with SIGSEGV in InstanceKlass::jni_id_for
  • 9acabeb: 8278104: C1 should support the compiler directive 'BreakAtExecute'
  • 0ccdda4: 8274465: Fix javax/swing/text/ParagraphView/6364882/bug6364882.java failures
  • 775e81d: 8273933: [TESTBUG] Test must run without preallocated exceptions
  • bd28050: 8278172: java/nio/channels/FileChannel/BlockDeviceSize.java should only run on Linux
  • a471f7a: 8275800: Redefinition leaks MethodData::_extra_data_lock
  • ccb5f86: 8273634: [TEST_BUG] Improve javax/swing/text/ParagraphView/6364882/bug6364882.java
  • 8e6ed88: 8239502: [TEST_BUG] Test javax/swing/text/FlowView/6318524/bug6318524.java never fails
  • 7daca99: 8275326: C2: assert(no_dead_loop) failed: dead loop detected

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 label Jan 5, 2022
@zhengyu123
Copy link
Contributor Author

@zhengyu123 zhengyu123 commented Jan 6, 2022

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jan 6, 2022

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

  • 3b5fc8c: 8278824: Uneven work distribution when scanning heap roots in G1
  • de2e289: 8278239: vmTestbase/nsk/jvmti/RedefineClasses/StressRedefine failed with EXCEPTION_ACCESS_VIOLATION at 0x000000000000000d
  • 4a188e9: 8277919: OldObjectSample event causing bloat in the class constant pool in JFR recording
  • ca59b64: 8277342: vmTestbase/nsk/stress/strace/strace004.java fails with SIGSEGV in InstanceKlass::jni_id_for
  • 9acabeb: 8278104: C1 should support the compiler directive 'BreakAtExecute'
  • 0ccdda4: 8274465: Fix javax/swing/text/ParagraphView/6364882/bug6364882.java failures
  • 775e81d: 8273933: [TESTBUG] Test must run without preallocated exceptions
  • bd28050: 8278172: java/nio/channels/FileChannel/BlockDeviceSize.java should only run on Linux
  • a471f7a: 8275800: Redefinition leaks MethodData::_extra_data_lock
  • ccb5f86: 8273634: [TEST_BUG] Improve javax/swing/text/ParagraphView/6364882/bug6364882.java
  • ... and 2 more: https://git.openjdk.java.net/jdk17u-dev/compare/256356d4e3321e36052261cde0ad8f9dc42358a0...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Jan 6, 2022
@openjdk openjdk bot closed this Jan 6, 2022
@openjdk openjdk bot removed ready rfr labels Jan 6, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Jan 6, 2022

@zhengyu123 Pushed as commit e54e3c4.

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

@shipilev shipilev

Assignees
No one assigned
Labels
backport integrated
Milestone
No milestone
2 participants
@zhengyu123 @shipilev