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

Reviewed-by: mdoerr
  • Loading branch information
@MBaesken
MBaesken committed Jan 2, 2023
1 parent 18ff1f5 commit 95d4db3
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions test/hotspot/jtreg/containers/docker/TestMemoryWithCgroupV1.java
View file
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

5 comments on commit 95d4db3

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@MBaesken
Copy link
Member Author

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 95d4db3 Jan 11, 2023

Choose a reason for hiding this comment

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

@MBaesken the backport was successfully created on the branch MBaesken-backport-95d4db3a in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 95d4db3a from the openjdk/jdk repository.

The commit being backported was authored by Matthias Baesken on 2 Jan 2023 and was reviewed by Martin Doerr.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev MBaesken-backport-95d4db3a:MBaesken-backport-95d4db3a
$ git checkout MBaesken-backport-95d4db3a
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev MBaesken-backport-95d4db3a

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 95d4db3 Jun 22, 2023

Choose a reason for hiding this comment

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

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 95d4db3 Jun 22, 2023

Choose a reason for hiding this comment

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

@GoeLin the backport was successfully created on the branch GoeLin-backport-95d4db3a in my personal fork of openjdk/jdk11u-dev. To create a pull request with this backport targeting openjdk/jdk11u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 95d4db3a from the openjdk/jdk repository.

The commit being backported was authored by Matthias Baesken on 2 Jan 2023 and was reviewed by Martin Doerr.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk11u-dev:

$ git fetch https://github.com/openjdk-bots/jdk11u-dev.git GoeLin-backport-95d4db3a:GoeLin-backport-95d4db3a
$ git checkout GoeLin-backport-95d4db3a
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk11u-dev.git GoeLin-backport-95d4db3a

Please sign in to comment.