[jdk11u-dev] RFR: 8254001: [Metrics] Enhance parsing of cgroup interface files for version detection

Severin Gehwolf sgehwolf at openjdk.java.net
Wed Apr 27 23:05:07 UTC 2022


On Wed, 13 Apr 2022 15:13:12 GMT, Andrew Azores <duke at openjdk.java.net> wrote:

>> src/java.base/linux/classes/jdk/internal/platform/CgroupSubsystemFactory.java line 197:
>> 
>>> 195:                 action = (tokens -> setCgroupV2Path(infos, tokens));
>>> 196:             }
>>> 197:             selfCgroupLines.map(line -> line.split(":"))
>> 
>> This will have to also include the fix from JDK-8272124 so that not regress. See: https://github.com/openjdk/jdk/commit/4d6593ce0243457e7431a5990957a8f880e0a3fb
>> 
>> It'll be covered by `TestCgroupSubsystemFactory` once [JDK-8284102](https://bugs.openjdk.java.net/browse/JDK-8284102), a 11u-only bug, gets fixed.
>
> Okay, so rather than backporting the whole 8272124 I should just cherry-pick out that single fix to this file for inclusion in this PR?

Yes. JDK-8272124 is in 11u since `11.0.13`. The backported fix was adapted and got adapted again with the initial cgroups v2 support patch in `java.base`. Basically we need to keep the code handling extra colons :) Before this patch it was done here:
https://github.com/openjdk/jdk11u-dev/pull/1020/files#diff-463442e0351f5129ca93998b61b6ab5edb7f95e71092069e44e516d9180ea160L111-L117

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

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


More information about the jdk-updates-dev mailing list