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

[jerboaa]

Clean backport. Fixes a test issue on cg v2 where --memory-swappiness is not supported.

---

Progress

• 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

• Andrew John Hughes (@gnu-andrew - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev pull/217/head:pull/217
$ git checkout pull/217

Update a local copy of the PR:
$ git checkout pull/217
$ git pull https://git.openjdk.org/jdk8u-dev pull/217/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 217

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/217.diff

[bridgekeeper]

👋 Welcome back sgehwolf! A progress list of the required criteria for merging this PR into pr/186 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

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

[mlbridge]

Webrevs

• 02: Full (fef4ad2c)
• 01: Full - Incremental (07ff7966)
• 00: Full (07ff7966)

[jerboaa]

/clean

[openjdk]

@jerboaa This backport pull request is now marked as clean

[openjdk-notifier]

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout jdk-8289695-cg2-crun-backport-2
git fetch https://git.openjdk.org/jdk8u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

[openjdk]

@jerboaa Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

[openjdk]

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

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

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

Reviewed-by: andrew

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:

• 5a3fc18: 8299804: Fix non-portable code in hotspot shell tests in 8u
• 1694a3a: 8296239: ISO 4217 Amendment 174 Update
• 7c51dae: 8294307: ISO 4217 Amendment 173 Update
• ca68579: 8289549: ISO 4217 Amendment 172 Update
• 65fcf61: 8293472: Incorrect container resource limit detection if manual cgroup fs mounts present
• 0f698da: 8299548: Fix hotspot/test/runtime/Metaspace/MaxMetaspaceSizeTest.java in 8u

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.

[gnu-andrew]

Makes sense. Was --memory-swappiness actually achieving anything on systems where it was supported?

[jerboaa]

Thanks!

Was --memory-swappiness actually achieving anything on systems where it was supported?

Memory swappiness is a cgroup v1 feature. So it might have had some effect, but for the purpose of the test I'm not sure it did matter as it was setting memory and memory/swap to the same value anyway. At least I'm not aware of any test failures of this OOM test with these settings.

[jerboaa]

/integrate

[openjdk]

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

• 5a3fc18: 8299804: Fix non-portable code in hotspot shell tests in 8u
• 1694a3a: 8296239: ISO 4217 Amendment 174 Update
• 7c51dae: 8294307: ISO 4217 Amendment 173 Update
• ca68579: 8289549: ISO 4217 Amendment 172 Update
• 65fcf61: 8293472: Incorrect container resource limit detection if manual cgroup fs mounts present
• 0f698da: 8299548: Fix hotspot/test/runtime/Metaspace/MaxMetaspaceSizeTest.java in 8u

Your commit was automatically rebased without conflicts.

[openjdk]

@jerboaa Pushed as commit 9d954b9.

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