8289695: [TESTBUG] TestMemoryAwareness.java fails on cgroups v2 and crun

Backport-of: ac6be165196457a26d837760b5f5030fe010d633
openjdk · Aug 26, 2022 · d13038a · d13038a · openjdk-notifier · Aug 26, 2022
1 parent 6d2cddf
commit d13038a
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java b/test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java
@@ -114,9 +114,8 @@ private static void testMemorySoftLimit(String valueToSet, String expectedTraceV
     private static void testOOM(String dockerMemLimit, int sizeToAllocInMb) throws Exception {
         Common.logNewTestCase("OOM");
 
-        // add "--memory-swappiness 0" so as to disable anonymous page swapping.
         DockerRunOptions opts = Common.newOpts(imageName, "AttemptOOM")
-            .addDockerOpts("--memory", dockerMemLimit, "--memory-swappiness", "0", "--memory-swap", dockerMemLimit);
+            .addDockerOpts("--memory", dockerMemLimit, "--memory-swap", dockerMemLimit);
         opts.classParams.add("" + sizeToAllocInMb);
 
         // make sure we avoid inherited Xmx settings from the jtreg vmoptions