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

8274523: java/lang/management/MemoryMXBean/MemoryTest.java test should handle Shenandoah #603

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Nov 8, 2021

Unclean backport to improve Shenandoah test. The uncleanliness is due to test block missing for Z (added later by JDK-8240679). I just dropped the @requires vm.gc != Z clause from one of the blocks.

Additional testing:

  • Linux x86_64 fastdebug test now passes with Shenandoah

Progress

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

Issue

  • JDK-8274523: java/lang/management/MemoryMXBean/MemoryTest.java test should handle Shenandoah

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 603

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 8, 2021

👋 Welcome back shade! 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 f8415a9b2f610ed431e6948c8174f6d982e5b31f 8274523: java/lang/management/MemoryMXBean/MemoryTest.java test should handle Shenandoah Nov 8, 2021
@openjdk
Copy link

openjdk bot commented Nov 8, 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 Nov 8, 2021
@mlbridge
Copy link

mlbridge bot commented Nov 8, 2021

Webrevs

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 6, 2021

@shipilev This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@shipilev
Copy link
Member Author

shipilev commented Dec 6, 2021

Not now, bot.

Anyone for review? :)

@GoeLin
Copy link
Member

GoeLin commented Dec 6, 2021

LGTM

I had a look at JDK-8240679, but that includes a fix to zGC, so backporting it as prerequisite is not advisable.

@openjdk
Copy link

openjdk bot commented Dec 6, 2021

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

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

8274523: java/lang/management/MemoryMXBean/MemoryTest.java test should handle Shenandoah

Reviewed-by: goetz, zgu

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

  • f8ed0fe: 8251558: J2DBench should support shaped and translucent windows
  • db702ee: 8254940: AArch64: Cleanup non-product thread members
  • 126a16e: 8266173: -Wmaybe-uninitialized happens in jni_util.c
  • 9d07232: 8263185: Mallinfo deprecated in glibc 2.33
  • 78ab2fb: 8257467: [TESTBUG] -Wdeprecated-declarations is reported at sigset() in exesigtest.c
  • 12ffc99: 8266176: -Wmaybe-uninitialized happens in libArrayIndexOutOfBoundsExceptionTest.c
  • a0c349b: 8274265: Suspicious string concatenation in logTestUtils.inline.hpp
  • 35964ca: 8222825: ARM32 SIGILL issue on single core CPU (not supported PLDW instruction)
  • d2ed8cd: 8276105: C2: Conv(D|F)2(I|L)Nodes::Ideal should handle rounding correctly
  • 596816e: 8268882: C2: assert(n->outcnt() != 0 || C->top() == n || n->is_Proj()) failed: No dead instructions after post-alloc
  • ... and 74 more: https://git.openjdk.java.net/jdk11u-dev/compare/299e6c8c08ad4984937d6bd886020cc48afd5f6e...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 ready Pull request is ready to be integrated label Dec 6, 2021
@shipilev
Copy link
Member Author

shipilev commented Dec 7, 2021

Thanks! Got the push approval as well.

/integrate

@openjdk
Copy link

openjdk bot commented Dec 7, 2021

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

  • 38bfb43: 8208074: [TESTBUG] vmTestbase/nsk/jvmti/RedefineClasses/StressRedefineWithoutBytecodeCorruption/TestDescription.java failed with NullPointerException
  • 3a452af: 8266168: -Wmaybe-uninitialized happens in check_code.c
  • c82d66c: 8266174: -Wmisleading-indentation happens in libmlib_image sources
  • f8ed0fe: 8251558: J2DBench should support shaped and translucent windows
  • db702ee: 8254940: AArch64: Cleanup non-product thread members
  • 126a16e: 8266173: -Wmaybe-uninitialized happens in jni_util.c
  • 9d07232: 8263185: Mallinfo deprecated in glibc 2.33
  • 78ab2fb: 8257467: [TESTBUG] -Wdeprecated-declarations is reported at sigset() in exesigtest.c
  • 12ffc99: 8266176: -Wmaybe-uninitialized happens in libArrayIndexOutOfBoundsExceptionTest.c
  • a0c349b: 8274265: Suspicious string concatenation in logTestUtils.inline.hpp
  • ... and 77 more: https://git.openjdk.java.net/jdk11u-dev/compare/299e6c8c08ad4984937d6bd886020cc48afd5f6e...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Dec 7, 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 Dec 7, 2021
@openjdk
Copy link

openjdk bot commented Dec 7, 2021

@shipilev Pushed as commit d0445aa.

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

@shipilev shipilev deleted the JDK-8274523-shenandoah-mxmemory branch December 21, 2021 09:03
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
3 participants