stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8274506: TestPids.java and TestPidsLimit.java fail with podman run as root

Browse Source 
Reviewed-by: mbaesken, cjplummer
This commit is contained in:
Severin Gehwolf 2021-09-30 08:53:31 +00:00
parent a8210c53e7
commit 94e31e5ca5
2 changed files with 12 additions and 2 deletions
test
hotspot/jtreg/containers/docker
TestPids.java
jdk/jdk/internal/platform/docker
TestPidsLimit.java

7
test/hotspot/jtreg/containers/docker/TestPids.java

@ -40,11 +40,15 @@ import jdk.test.lib.containers.docker.Common;
import jdk.test.lib.containers.docker.DockerRunOptions;
import jdk.test.lib.containers.docker.DockerTestUtils;
import jdk.test.lib.Asserts;
import jdk.test.lib.Container;
import jdk.test.lib.Platform;
import jdk.test.lib.Utils;
public class TestPids {
private static final String imageName = Common.imageName("pids");
private static final boolean IS_PODMAN = Container.ENGINE_COMMAND.contains("podman");
private static final int UNLIMITED_PIDS_PODMAN = 0;
private static final int UNLIMITED_PIDS_DOCKER = -1;
static final String warning_kernel_no_pids_support = "WARNING: Your kernel does not support pids limit capabilities";
@ -139,7 +143,8 @@ public class TestPids {
DockerRunOptions opts = commonOpts();
if (value.equals("Unlimited")) {
opts.addDockerOpts("--pids-limit=-1");
int unlimited = IS_PODMAN ? UNLIMITED_PIDS_PODMAN : UNLIMITED_PIDS_DOCKER;
opts.addDockerOpts("--pids-limit=" + unlimited);
} else {
opts.addDockerOpts("--pids-limit="+value);
}

7
test/jdk/jdk/internal/platform/docker/TestPidsLimit.java

@ -39,9 +39,13 @@ import jdk.test.lib.containers.docker.DockerRunOptions;
import jdk.test.lib.containers.docker.DockerTestUtils;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Asserts;
import jdk.test.lib.Container;
public class TestPidsLimit {
private static final String imageName = Common.imageName("pids");
private static final boolean IS_PODMAN = Container.ENGINE_COMMAND.contains("podman");
private static final int UNLIMITED_PIDS_PODMAN = 0;
private static final int UNLIMITED_PIDS_DOCKER = -1;
public static void main(String[] args) throws Exception {
if (!DockerTestUtils.canTestDocker()) {
@ -107,7 +111,8 @@ public class TestPidsLimit {
Common.logNewTestCase("testPidsLimit (limit: " + pidsLimit + ")");
DockerRunOptions opts = Common.newOptsShowSettings(imageName);
if (pidsLimit.equals("Unlimited")) {
opts.addDockerOpts("--pids-limit=-1");
int unlimited = IS_PODMAN ? UNLIMITED_PIDS_PODMAN : UNLIMITED_PIDS_DOCKER;
opts.addDockerOpts("--pids-limit=" + unlimited);
} else {
opts.addDockerOpts("--pids-limit="+pidsLimit);
}