[jdk21u-dev] Integrated: 8302744: Refactor Hotspot container detection code
Jan Kratochvil
jkratochvil at openjdk.org
Thu Jun 12 12:41:40 UTC 2025
On Mon, 14 Apr 2025 09:11:37 GMT, Jan Kratochvil <jkratochvil at openjdk.org> wrote:
> A patch 1 of 6 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)
>
> The backport is not clean:
>
> - `src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp` and `src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp` are missing changed `CgroupV1Subsystem::memory_and_swap_usage_in_bytes()` as [JDK-8325139](https://github.com/openjdk/jdk/commit/3d106cb091de6b6ef2a9bf483fb0f5c98c28263c) has not been backported.
>
> - `src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp` and `src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp` are missing changed `CgroupV1Subsystem::rss_usage_in_bytes()` as [JDK-8313083](https://github.com/openjdk/jdk/commit/c96cbe481c86800b76e220374b24b6671984adb7) has not been backported.
>
> - deleted/renamed `test/hotspot/gtest/os/linux/test_cgroupSubsystem_linux.cpp` has missing `static` keywords as [JDK-8252136](https://github.com/openjdk/jdk/commit/09d4936657a0bdc122a4ab80735bd9c8c109839c) has not been backported.
>
> 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: 8a6ea1b3
Author: Jan Kratochvil <jkratochvil at openjdk.org>
Committer: Severin Gehwolf <sgehwolf at openjdk.org>
URL: https://git.openjdk.org/jdk21u-dev/commit/8a6ea1b36909479b06f1ed273ed2c0dd8e34e364
Stats: 1262 lines in 10 files changed: 688 ins; 436 del; 138 mod
8302744: Refactor Hotspot container detection code
Reviewed-by: sgehwolf
Backport-of: 3d4eb159e6d597f37081faf21b7e3f0f1af299e5
-------------
PR: https://git.openjdk.org/jdk21u-dev/pull/1648
More information about the jdk-updates-dev
mailing list