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

8275051: Shenandoah: Correct ordering of requested gc cause and gc request flag #533

Closed
wants to merge 1 commit into from
Closed

Conversation

zhengyu123
Copy link
Contributor

@zhengyu123 zhengyu123 commented Oct 18, 2021

I would like to backport this Shenandoah specific patch to 11u.

The patch corrects the order of a couple of GC flags, ensure GC sees latest GC cause when a GC is requested.

The original patch does not apply cleanly, due to context differences, especially, the grand refactoring in 17. The conflicts are resolved manually.

Test:

  • hotspot_gc_shenandoah

Progress

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

Issue

  • JDK-8275051: Shenandoah: Correct ordering of requested gc cause and gc request flag

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 533

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 18, 2021

👋 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 1ab64143c06e33e23172dd77c39e434443347364 8275051: Shenandoah: Correct ordering of requested gc cause and gc request flag Oct 18, 2021
@openjdk
Copy link

openjdk bot commented Oct 18, 2021

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Oct 18, 2021
@mlbridge
Copy link

mlbridge bot commented Oct 18, 2021

Webrevs

@openjdk
Copy link

openjdk bot commented Oct 18, 2021

@zhengyu123 This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8275051: Shenandoah: Correct ordering of requested gc cause and gc request flag

Reviewed-by: phh

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

  • 49681f2: 8239827: The test OpenByUNCPathNameTest.java should be changed to be manual
  • 611d729: 8233647: [TESTBUG] JColorChooser/Test8051548.java is failing on macos
  • b8c6841: 8233566: [TESTBUG] KeyboardFocusManager tests failing on MacoS
  • a2628a0: 8233552: [TESTBUG] JTable Test bug7068740.java fails on MacOS

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 Oct 18, 2021
@zhengyu123
Copy link
Contributor Author

Thanks for the review, @phohensee

@zhengyu123
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 20, 2021

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

  • 4b6e487: 8197800: Test java/awt/Focus/NonFocusableWindowTest/NoEventsTest.java fails on Windows
  • 5a2b2ac: 8198619: java/awt/Focus/FocusTraversalPolicy/ButtonGroupLayoutTraversal/ButtonGroupLayoutTraversalTest.java fails on mac
  • b449303: 8171998: javax/swing/JMenu/4692443/bug4692443.java fails on Windows
  • cdc48c2: 8256201: java/awt/FullScreen/FullscreenWindowProps/FullscreenWindowProps.java failed
  • 93e98ad: 8266579: Update test/jdk/java/lang/ProcessHandle/PermissionTest.java & test/jdk/java/sql/testng/util/TestPolicy.java
  • 1772cf1: 8272708: [Test]: Cleanup: test/jdk/security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java no longer needs ocspEnabled
  • 0f9d6bf: 8247510: typo in IllegalHandshakeMessage
  • f62113a: 8207936: TestZipFile failed with java.lang.AssertionError exception
  • eb03bf7: 8261075: Create stubRoutines.inline.hpp with SafeFetch implementation
  • d5017c3: 8270517: Add Zero support for LoongArch
  • ... and 11 more: https://git.openjdk.java.net/jdk11u-dev/compare/4a9c879e66e501b43fcd459e656437df35a16834...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 20, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 20, 2021
@openjdk
Copy link

openjdk bot commented Oct 20, 2021

@zhengyu123 Pushed as commit 1297c26.

💡 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 integrated Pull request has been integrated
2 participants