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

[Ioi Lam]

On Thu, 15 Sep 2022 08:55:41 GMT, Severin Gehwolf <sgehwolf at openjdk.org> wrote:

>> 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:
>> - [x] fastdebug build on cgroups v2 and cgroups v1 (before and after the product fix)
>> - [x] added tests fail before, pass after the product fix.
>> - [x] Some manual testing using `cgcreate` and `cgexec` on cg1 and cg2. Still pass. 
>> - [x] GHA all pass.
>> 
>> Please review! Many thanks in advance.
>
> Severin Gehwolf has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains one commit:
> 
>   8293540: [Metrics] Potentially incorrectly detected resource limits with additional cgroup fs mounts

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

test/jdk/jdk/internal/platform/docker/TestDockerBasic.java line 26:

> 24: /*
> 25:  * @test
> 26:  * @summary Verify that -XshowSettings:system works

Add `@bug 8293540`

test/jdk/jdk/internal/platform/docker/TestDockerBasic.java line 64:

> 62:         opts.addDockerOpts("--memory", "300m");
> 63:         if (addCgroupMounts) {
> 64:             opts.addDockerOpts("--volume", "/sys/fs/cgroup:/cgroup-in:ro");

Add comments that the extra mount should be ignored by the cgroup set-up code. (Same for other test cases).

-------------

Marked as reviewed by iklam (Reviewer).

PR: https://git.openjdk.org/jdk/pull/10248