[jdk11u-dev] Integrated: 8231111: Cgroups v2: Rework Metrics in java.base so as to recognize unified hierarchy

[Zhengyu Gu]

On Tue, 8 Mar 2022 18:47:32 GMT, Zhengyu Gu <zgu at openjdk.org> wrote:

> This is a followup backport for Cgroup v2 support.
> 
> The original patch does not apply cleanly, due to context differences and some of out-of-order backports, conflicts were resolved manually.
> 
> In additional:
> 
> 1) Include partial backport of JDK-8250627.
>     - Renamed `Metrics.c` =>  `CgroupMetrics.c`
>     - Added native method `isUseContainerSupport()` to `CgroupMetrics.java`
>     - Return instance only if `isUseContainerSupport()` is enabled.
>    
> 2) Add `createTempDirectory()` method to `test/lib/jdk/test/lib/Utils.java` for `TestCgroupSubsystemController.java` test
> 
> 3) Add `import jdk.test.lib.process.OutputAnalyzer;` to `TestDockerMemoryMetrics.java`
> 
> Test:
> 
> - [x] jtreg containers/docker test on Ubuntu 20.04.4 LTS
> - [x] jdk/internal/platform/cgroup on Ubuntu 20.04.4 LTS
> - [x] jdk/internal/platform/docker on Ubuntu 20.04.4 LTS

This pull request has now been integrated.

Changeset: 19f26f72
Author:    Zhengyu Gu <zgu at openjdk.org>
URL:       https://git.openjdk.java.net/jdk11u-dev/commit/19f26f725fdc29ee0eb4e330a275134663933629
Stats:     5351 lines in 31 files changed: 3618 ins; 1599 del; 134 mod

8231111: Cgroups v2: Rework Metrics in java.base so as to recognize unified hierarchy

Reviewed-by: sgehwolf
Backport-of: 4def210a22faaec6b47912dd314e6365ea48d28f

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

PR: https://git.openjdk.java.net/jdk11u-dev/pull/863