[jdk21u-dev] Integrated: 8261242: [Linux] OSContainer::is_containerized() returns true when run outside a container
Jan Kratochvil
jkratochvil at openjdk.org
Mon Jun 23 12:11:33 UTC 2025
On Wed, 16 Apr 2025 10:31:35 GMT, Jan Kratochvil <jkratochvil at openjdk.org> wrote:
> A patch 3 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 2 of 7: https://github.com/openjdk/jdk21u-dev/pull/1660
>
> This backport is not clean as noticed by @MBaesken - `test/hotspot/jtreg/ProblemList.txt` was removing `containers/cgroup/PlainRead.java` but that testcase is missing in JDK21 so there is nothing to remove.
>
> There was also a trivial conflict with backported JDK-8313083 in `src/hotspot/os/linux/cgroupSubsystem_linux.hpp`.
>
> The backport also contains an additional oneliner (by Yuri Nesterenko):
>
> make/data/hotspot-symbols/symbols-linux:
> +JVM_IsContainerized
>
> as otherwise the build would fail with:
>
> src/java.base/linux/native/libjava/CgroupMetrics.c:42:(.text+0x11): undefined reference to `JVM_IsContainerized'
>
> This oneliner was not needed in JDK24 as there is [JDK-8017234: Hotspot should stop using mapfiles](https://bugs.openjdk.org/browse/JDK-8017234).
>
> 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: 6f050780
Author: Jan Kratochvil <jkratochvil at openjdk.org>
Committer: Severin Gehwolf <sgehwolf at openjdk.org>
URL: https://git.openjdk.org/jdk21u-dev/commit/6f05078019ffbda281f1a45810c69c193624b81f
Stats: 411 lines in 20 files changed: 306 ins; 78 del; 27 mod
8261242: [Linux] OSContainer::is_containerized() returns true when run outside a container
Reviewed-by: dcherepanov, mbaesken, sgehwolf
Backport-of: 18cffb604a5f56ef59e56840f2bb9fd27f8485db
-------------
PR: https://git.openjdk.org/jdk21u-dev/pull/1661
More information about the jdk-updates-dev
mailing list