[jdk21u-dev] Integrated: 8331560: Refactor Hotspot container detection code so that subsystem delegates to controllers
Jan Kratochvil
jkratochvil at openjdk.org
Tue Jul 1 13:58:51 UTC 2025
On Wed, 16 Apr 2025 10:42:40 GMT, Jan Kratochvil <jkratochvil at openjdk.org> wrote:
> A patch 5 of 7 for: [[21u] Backport intention of 8322420: [Linux] cgroup v2: Limits in parent nested control groups are not detected](https://mail.openjdk.org/pipermail/jdk-updates-dev/2025-April/043206.html)
>
> It has a patch dependency on PR 3 of 7: https://github.com/openjdk/jdk21u-dev/pull/1661
>
> This backport is not clean:
>
> - `src/hotspot/os/linux/cgroupSubsystem_linux.hpp`, `src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp`, `src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp`, `src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp`, `src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp` are missing `CgroupSubsystem::memory_and_swap_usage_in_bytes()` as [JDK-8325139](https://github.com/openjdk/jdk/commit/3d106cb091de6b6ef2a9bf483fb0f5c98c28263c) has not been backported.
>
> - `src/hotspot/os/linux/cgroupSubsystem_linux.hpp`, `src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp`, `src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp`, `src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp`, `src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp` have some differences in `CgroupSubsystem::rss_usage_in_bytes()` and `CgroupSubsystem::cache_usage_in_bytes()` placement as [JDK-8313083](https://github.com/openjdk/jdk/commit/c96cbe481c86800b76e220374b24b6671984adb7) has been backported independently.
>
> The whole patchset has been tested on CentOS-7.9 (for cgroup v1) and on Fedora 40 (for cgroup v2) for test/hotspot/jtreg/containers.
This pull request has now been integrated.
Changeset: 7facfe3c
Author: Jan Kratochvil <jkratochvil at openjdk.org>
Committer: Severin Gehwolf <sgehwolf at openjdk.org>
URL: https://git.openjdk.org/jdk21u-dev/commit/7facfe3ca92651fef03e4ea9d4c953e2e5585769
Stats: 570 lines in 8 files changed: 325 ins; 81 del; 164 mod
8331560: Refactor Hotspot container detection code so that subsystem delegates to controllers
Reviewed-by: sgehwolf
Backport-of: 65a282aae3f81379f1471db4fc0ff2e3b479140e
-------------
PR: https://git.openjdk.org/jdk21u-dev/pull/1662
More information about the jdk-updates-dev
mailing list