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

openjdk-notifier[bot] duke at openjdk.java.net
Wed Mar 23 12:31:39 UTC 2022


On Thu, 17 Mar 2022 17:40:06 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
>
> Zhengyu Gu has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 13 commits:
> 
>  - Merge
>  - Merge
>  - Merge branch 'master' into backport-8231111-unified-hierarchy
>  - Fixes
>  - Fix MetricsTesterCgroupV1
>  - More fixes
>  - Fix indents and whitespaces
>  - Redo CgroupV1Subsystem.java merge
>  - Severin's comments - 2
>  - Severin's comments
>  - ... and 3 more: https://git.openjdk.java.net/jdk11u-dev/compare/ab03faaa...171d73f7

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 backport-8230305-cgroup-v2
git fetch https://git.openjdk.java.net/jdk11u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

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

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


More information about the jdk-updates-dev mailing list