[jdk8u-dev] RFR: 8244500: jtreg test error in test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java [v4]
Severin Gehwolf
sgehwolf at openjdk.org
Mon Nov 7 15:02:46 UTC 2022
On Fri, 4 Nov 2022 10:24:00 GMT, Jonathan Dowland <jdowland at openjdk.org> wrote:
>> This is a backport of 8244500 to jdk8u-dev as part of cgroups v2 support.
>>
>> It's a test-only change.
>>
>> The patch needed adjusting for jdk8u, mostly to JDK-module-specific things.
>
> Jonathan Dowland has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains 29 additional commits since the last revision:
>
> - Don't pass --add-exports to jdk8u java inside docker
>
> These are JDK9+ module specific parameters.
> - 8244500: jtreg test error in test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java
>
> When the kernel doesn't support swap limits, expect host values instead.
>
> Reviewed-by: sgehwolf
> Backport-of: fb5132254d834ba01a4b65ce64143843e83c674e
> - Move test to a more 8u-appropriate location
>
> Container (cgroups, docker) tests in 8u reside in
> hotspot/test/runtime/containers
> - remove duplicate include of osContainer_linux
>
> With the backport of 8189762, the include of osContainer_linux was
> moved to a later #ifdef stanza, relative to the original. This caused
> a context problem with this backport.
> - 8239785: Cgroups: Incorrect detection logic on old systems in hotspot
>
> Return NULL subsystem if no cgroup controllers are mounted.
>
> Reviewed-by: sgehwolf
> Backport-of: add18914fb1294999877b563c734a25b4c17b922
> - 8237479: 8230305 causes slowdebug build failure
>
> Declare methods as pure virtual.
>
> Backport-of: 4ca06995855b5c974321d7b3622d661b8d27ba76
> - 8253714: [cgroups v2] Soft memory limit incorrectly using memory.high
>
> The early implementation of cgroups v2 support was done with
> crun 0.8 and it contained a bug which set memory.high over
> memory.low when --memory-reservation was being used as a CLI
> option.
>
> This bug has been fixed in later crun versions, starting with
> crun 0.11. Use memory.low in OpenJDK as well.
>
> Backport-of: ff6843ca4842498791061f924c545fa9469cc1dc
> - Address style nit
> - 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)
> - ... and 19 more: https://git.openjdk.org/jdk8u-dev/compare/a62109c5...0cfe1277
This really is a no-op change when it comes to tests. It only syncs the code to include the Metrics debugging for this test. This is fine, though, since the actual changes to `hotspot/test/runtime/containers/docker/TestMemoryAwareness.java` got included with [JDK-8250984](https://github.com/openjdk/jdk8u/commit/af9ea420d32146896eee035e06802daada52aab5)
-------------
Marked as reviewed by sgehwolf (Reviewer).
PR: https://git.openjdk.org/jdk8u-dev/pull/142
More information about the jdk8u-dev
mailing list