8244500: jtreg test error in test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java

[jmtd]

This is a backport of 8244500 to jdk8u-dev as part of cgroups v2 support.

It's a test-only change.

The patch needed adjusting for jdk8u, mostly to JDK-module-specific things.

---

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-8244500: jtreg test error in test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java

Reviewers

• Severin Gehwolf (@jerboaa - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 142

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

Using diff file

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

[bridgekeeper]

👋 Welcome back jdowland! A progress list of the required criteria for merging this PR into pr/136 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 and summary from the original commit.

[mlbridge]

Webrevs

• 06: Full (cdb15f35)
• 05: Full (4e074846)
• 04: Full - Incremental (ccb9c108)
• 03: Full (0cfe1277)
• 02: Full (a62109c5)
• 01: Full - Incremental (0536c56d)
• 00: Full (0536c56d)

[openjdk-notifier]

@jmtd Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

[openjdk-notifier]

@jmtd Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

[jerboaa]

This really is a no-op change when it comes to tests. It only syncs the code to include the Metrics debugging for this test. This is fine, though, since the actual changes to hotspot/test/runtime/containers/docker/TestMemoryAwareness.java got included with JDK-8250984

[openjdk-notifier]

@jmtd Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

[bridgekeeper]

@jmtd 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!

[jmtd]

wake up

[openjdk]

@jmtd Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

[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 8244500-jdk8u-dev
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]

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

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

8244500: jtreg test error in test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java

When the kernel doesn't support swap limits, expect host values instead.

Reviewed-by: sgehwolf

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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]

This patch needs a rebase, now.

[jmtd]

This patch needs a rebase, now.

Aargh :) I did all of them this morning. One useful outcome: it's not worthwhile to try and rebase ahead of the merges. We might face this each time regardless.

[openjdk]

@jmtd Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

[jerboaa]

Still good.

[jerboaa]

Feel free to integrate.

[jerboaa]

This patch needs a rebase, now.

Aargh :) I did all of them this morning. One useful outcome: it's not worthwhile to try and rebase ahead of the merges. We might face this each time regardless.

Yep. Once this one is integrated, a rebase of the next one in the chain #124 will need a rebase :-/ Good times.

[jmtd]

/integrate

[openjdk]

Going to push as commit 4ab80ff.

[openjdk]

@jmtd Pushed as commit 4ab80ff.

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