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

8220674: [TESTBUG] MetricsMemoryTester failcount test in docker container only works with debug JVMs

Browse Source 
Reviewed-by: sspitsyn, sgehwolf
This commit is contained in:
Bob Vandette 2019-03-21 14:40:04 -04:00
parent fd14375ae2
commit af5c78efff
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/jdk/jdk/internal/platform/docker/MetricsMemoryTester.java
View File

@ -64,10 +64,15 @@ public class MetricsMemoryTester {
long count = Metrics.systemMetrics().getMemoryFailCount();
// Allocate 512M of data
long[][] longs = new long[64][];
for (int i = 1; i <= 64; i++) {
byte[][] bytes = new byte[64][];
for (int i = 0; i < 64; i++) {
try {
longs[i] = new long[8 * 1024 * 1024];
bytes[i] = new byte[8 * 1024 * 1024];
// Break out as soon as we see an increase in failcount
// to avoid getting killed by the OOM killer.
if (Metrics.systemMetrics().getMemoryFailCount() > count) {
break;
}
} catch (Error e) { // OOM error
break;
}

1
test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java
View File

@ -90,6 +90,7 @@ public class TestDockerMemoryMetrics {
new DockerRunOptions(imageName, "/jdk/bin/java", "MetricsMemoryTester");
opts.addDockerOpts("--volume", Utils.TEST_CLASSES + ":/test-classes/")
.addDockerOpts("--memory=" + value)
.addJavaOpts("-Xmx" + value)
.addJavaOpts("-cp", "/test-classes/")
.addJavaOpts("--add-exports", "java.base/jdk.internal.platform=ALL-UNNAMED")
.addClassOptions("failcount");