8293540: [Metrics] Incorrectly detected resource limits with additional cgroup fs mounts

[jerboaa]

Similar issue to the hotspot change discussed in https://bugs.openjdk.org/browse/JDK-8293472. The Java metrics implementation may get the resource limits wrong if there are additional cgroup fs mounts. Apparently that's more common than one might think. I've reproduced this with these existing tests on cg v2:

test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java
test/jdk/jdk/internal/platform/docker/TestDockerCpuMetrics.java
test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java 

I've also added test/jdk/jdk/internal/platform/docker/TestDockerBasic.java and amended test/jdk/jdk/internal/platform/cgroup/TestCgroupSubsystemFactory.java which unconditionally fails (irrespective of cgroup version in use). The fix is fairly straight forward and is an extension which we already do for the cpuset controller: Allow duplicates, and if there are any prefer those mounted at /sys/fs/cgroup.

Testing:

• fastdebug build on cgroups v2 and cgroups v1 (before and after the product fix)
• added tests fail before, pass after the product fix.
• Some manual testing using cgcreate and cgexec on cg1 and cg2. Still pass.
• GHA all pass.

Please review! Many thanks in advance.

---

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-8293540: [Metrics] Incorrectly detected resource limits with additional cgroup fs mounts

Reviewers

• Ioi Lam (@iklam - Reviewer) ⚠️ Review applies to 8059dd81

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10248

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

Using diff file

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

[bridgekeeper]

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

[openjdk]

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

• core-libs
• hotspot-runtime
• serviceability

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 04: Full - Incremental (3ecb3b9d)
• 03: Full - Incremental (6061a475)
• 02: Full (8059dd81)
• 01: Full - Incremental (9cc6c7cd)
• 00: Full (9cc6c7cd)

[dcubed-ojdk]

I fixed a typo in the bug's synopsis line so this PR's title needs to be update.
Doing a "/issue JDK-8293540" will do the trick.

[jerboaa]

Thanks! I've updated the PR title to match the bug synopsis.

[openjdk-notifier]

The dependent pull request 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-8293540-metrics-cgroups-mounts
git fetch https://git.openjdk.org/jdk 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 this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout JDK-8293540-metrics-cgroups-mounts
git fetch https://git.openjdk.org/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

[openjdk-notifier]

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

Anyone willing to review this? Thanks!

[jerboaa]

@iklam Could you help me getting this reviewed, please?

[iklam]

The JDK change looks good to me. Some nits for the test cases.

[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:

8293540: [Metrics] Incorrectly detected resource limits with additional cgroup fs mounts

Reviewed-by: iklam

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]

Thanks for the review @iklam!

[jerboaa]

/integrate

[openjdk]

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

• 6974978: 8294521: Parallel: Remove unused field in UpdateDensePrefixAndCompactionTask
• 81fda1b: 8294569: Remove CardTable::_last_valid_index
• 7c60e6d: 8293770: RISC-V: Reuse runtime call trampolines
• 9dce865: 8294115: JNI local refs exceeds capacity warning in NetworkInterface::getAll
• b030c7d: 8225235: Unused field defaultIndex in NetworkInterface
• a07975b: 8294519: (fs) java/nio/file/Files/CopyProcFile.java fails intermittenly due to unstable /proc/cpuinfo output
• 88062ee: 8293969: breakup the long signature in SystemDictionaryShared::is_supported_invokedynamic
• aeef3ec: 8294198: Implement isFinite intrinsic for RISC-V
• 5f6ad92: 8294547: HotSpotAgent.setupVM() should include "cause" exception when throwing DebuggerException
• 545ded1: 8294548: Problem list SA core file tests on macosx-x64 due to JDK-8294316
• ... and 2 more: https://git.openjdk.org/jdk/compare/ce85cac947158b4e1f554c55f726c923a49b1a41...master

Your commit was automatically rebased without conflicts.

[openjdk]

@jerboaa Pushed as commit 6d83482.

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