Skip to content

Commit

Permalink
8289695: [TESTBUG] TestMemoryAwareness.java fails on cgroups v2 and crun
Browse files Browse the repository at this point in the history 
Reviewed-by: sspitsyn
  • Loading branch information
@jerboaa
jerboaa committed Jul 6, 2022
1 parent 4ad18cf commit ac6be16
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

3 comments on commit ac6be16

@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

@jerboaa
Copy link
Contributor 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 ac6be16 Aug 25, 2022

Choose a reason for hiding this comment

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

@jerboaa the backport was successfully created on the branch jerboaa-backport-ac6be165 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 ac6be165 from the openjdk/jdk repository.

The commit being backported was authored by Severin Gehwolf on 6 Jul 2022 and was reviewed by Serguei Spitsyn.

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 jerboaa-backport-ac6be165:jerboaa-backport-ac6be165
$ git checkout jerboaa-backport-ac6be165
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev jerboaa-backport-ac6be165

Please sign in to comment.