Skip to content

Commit

Permalink
8299424: containers/docker/TestMemoryWithCgroupV1.java fails on SLES1…
Browse files Browse the repository at this point in the history
…2 ppc64le when testing Memory and Swap Limit

Backport-of: 95d4db3a92228d0211fa369c7d12d54234b22f72
  • Loading branch information
MBaesken committed Jan 13, 2023
1 parent 63da2b0 commit 4780e49
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions test/hotspot/jtreg/containers/docker/TestMemoryWithCgroupV1.java
Expand Up @@ -85,10 +85,14 @@ private static void testMemoryLimitWithSwappiness(String dockerMemLimit, String
// capabilities or the cgroup is not mounted. Memory limited without swap."
// we only have Memory and Swap Limit is: <huge integer> in the output
try {
out.shouldContain("Memory and Swap Limit is: " + expectedReadLimit)
.shouldContain(
if (out.getOutput().contains("memory_and_swap_limit_in_bytes: not supported")) {
System.out.println("memory_and_swap_limit_in_bytes not supported, avoiding Memory and Swap Limit check");
} else {
out.shouldContain("Memory and Swap Limit is: " + expectedReadLimit)
.shouldContain(
"Memory and Swap Limit has been reset to " + expectedResetLimit + " because swappiness is 0")
.shouldContain("Memory & Swap Limit: " + expectedLimit);
.shouldContain("Memory & Swap Limit: " + expectedLimit);
}
} catch (RuntimeException ex) {
System.out.println("Expected Memory and Swap Limit output missing.");
System.out.println("You may need to add 'cgroup_enable=memory swapaccount=1' to the Linux kernel boot parameters.");
Expand Down

1 comment on commit 4780e49

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.