8289695: [TESTBUG] TestMemoryAwareness.java fails on cgroups v2 and crun

[jerboaa]

Please review this test change to also support crun on cgroups v2 systems. crun aborts any invocation that includes --memory-swappiness CLI option. I don't think it's needed for the purpose of the test. --memory X and --memory-swap X where X is the same value already tells the system to not use swap.

Tested on Linux x86_64, cgroups v1 and cgroups v2 systems (including an affected one).

---

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-8289695: [TESTBUG] TestMemoryAwareness.java fails on cgroups v2 and crun

Reviewers

• Serguei Spitsyn (@sspitsyn - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9366

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

Using diff file

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

[bridgekeeper]

👋 Welcome back sgehwolf! 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.

[jerboaa]

@MBaesken If you could test this on a system similar to where https://bugs.openjdk.org/browse/JDK-8229182 was tested, I'd appreciate it. The existing code got introduced by that bug. Thanks!

[openjdk]

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

• hotspot-runtime

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 (57a455bd)

[MBaesken]

@MBaesken If you could test this on a system similar to where https://bugs.openjdk.org/browse/JDK-8229182 was tested, I'd appreciate it. The existing code got introduced by that bug. Thanks!

Hi Severin, the test adjusted by you passed on our SLES12 Linux ppc64le system.
Best regards, Matthias

[jerboaa]

@MBaesken If you could test this on a system similar to where https://bugs.openjdk.org/browse/JDK-8229182 was tested, I'd appreciate it. The existing code got introduced by that bug. Thanks!

Hi Severin, the test adjusted by you passed on our SLES12 Linux ppc64le system. Best regards, Matthias

Great, thanks very much for testing. In this case, it should be safe to just remove --memory-swappiness for this test then.

[sspitsyn]

Looks good.
Thanks,
Serguei

[openjdk]

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

8289695: [TESTBUG] TestMemoryAwareness.java fails on cgroups v2 and crun

Reviewed-by: sspitsyn

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

• 77c3bbf: 8289617: Remove test/jdk/java/net/ServerSocket/ThreadStop.java
• a5934cd: 8289698: AArch64: Need to relativize extended_sp in frame
• fd1bb07: 8287603: Avoid redundant HashMap.containsKey calls in NimbusDefaults.getDerivedColor
• 4c997ba: 8289520: G1: Remove duplicate checks in G1BarrierSetC1::post_barrier
• 1b997db: 8289427: compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java failed with null setting
• 688712f: 8289633: Forbid raw C-heap allocation functions in hotspot and fix findings
• df063f7: 8289484: Cleanup unnecessary null comparison before instanceof check in java.rmi
• 9ccae70: 8287593: ShortResponseBody could be made more resilient to rogue connections
• bad9ffe: 8288947: G1: Consolidate per-region is-humongous query in G1CollectedHeap
• b5d9656: 8288971: AArch64: Clean up stack and register handling in interpreter
• ... and 73 more: https://git.openjdk.org/jdk/compare/88fe19c5b2d809d5b9136e1a86887a50d0eeeb55...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.

[jerboaa]

Thanks for the review!

[jerboaa]

/integrate

[openjdk]

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

• 4ad18cf: 8289730: Deprecated code sample in java.lang.ClassCastException
• d8f4e97: 8289146: containers/docker/TestMemoryWithCgroupV1.java fails on linux ppc64le machine with missing Memory and Swap Limit output
• f783244: 8289706: (cs) Avoid redundant TreeMap.containsKey call in AbstractCharsetProvider
• fafe8b3: 8289604: compiler/vectorapi/VectorLogicalOpIdentityTest.java failed on x86 AVX1 system
• 3515604: 8280481: Duplicated stubs to interpreter for static calls
• d48694d: 8283335: Add exists and readAttributesIfExists methods to FileSystemProvider
• c45d613: 8289687: [JVMCI] bug in HotSpotResolvedJavaMethodImpl.equals
• 77c3bbf: 8289617: Remove test/jdk/java/net/ServerSocket/ThreadStop.java
• a5934cd: 8289698: AArch64: Need to relativize extended_sp in frame
• fd1bb07: 8287603: Avoid redundant HashMap.containsKey calls in NimbusDefaults.getDerivedColor
• ... and 80 more: https://git.openjdk.org/jdk/compare/88fe19c5b2d809d5b9136e1a86887a50d0eeeb55...master

Your commit was automatically rebased without conflicts.

[openjdk]

@jerboaa Pushed as commit ac6be16.

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