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

Jonathan Dowland jdowland at openjdk.org
Thu Dec 1 10:24:00 UTC 2022


On Tue, 27 Sep 2022 08:10:39 GMT, Jonathan Dowland <jdowland at openjdk.org> wrote:

>> Jonathan Dowland has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 15 commits:
>> 
>>  - TestCgroupSubsystemController: rework use of Files.writeString
>>  - CgroupSubsystemController: fix library paths
>>    
>>    We need the testlibrary copy of FileUtils but the test.lib.util copy of
>>    Utils (method createTempDirectory is missing from the testlib copy)
>>  - TestCgroupSubsystemController: fix jtreg @library path
>>  - Replace Arrays.compare with Arrays.equals
>>    
>>    jdk8u does not have Arrays.compare()
>>  - incorporate (part of) 8275713: TestDockerMemoryMetrics test fails on recent runc
>>    
>>    The main hunk from 8275713 was rolled up in the changes for 8231111.
>>    This line is also necessary.
>>  - update mapfile for new JNI method name
>>  - tests for the backport
>>    
>>    two files had fairly significant merge conflicts, eyeball only to resolve
>>    
>>    haven't run any of them yet -- will depend on the rest of the patch
>>  - CgroupSubsystemFactory: remove logging lines
>>    
>>    jdk8u doesn't have java.lang.System.Logger. There's no existing logging
>>    in place for other classes in the Metrics/platform/etc family that I can
>>    see, so remove it.
>>  - Metrics => CgroupV1Subsystem.java
>>    
>>    unshuffle, rename, resolve unclean hunks although I'm not sure why they
>>    didn't apply, they look trivial and the context is the same, will look
>>    closer
>>  - Metrics.java: easy commit, mostly doc-only hunks
>>  - ... and 5 more: https://git.openjdk.org/jdk8u-dev/compare/91dc4a09...0ea3c608
>
> I have ended up (artificially) making this PR depend upon pr/123, so that another PR, https://github.com/openjdk/jdk8u-dev/pull/124, can depend upon this one and get both - it depends upon both.

> @jmtd Please rebase this onto latest master. Right now it looks like changes from https://github.com/openjdk/jdk8u-dev/pull/127 are included here, which shouldn't be?

Done.

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

PR: https://git.openjdk.org/jdk8u-dev/pull/121


More information about the jdk8u-dev mailing list