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

8206456: [TESTBUG] docker jtreg tests fail on systems without cpuset.effective_cpus / cpuset.effective_mem

Browse Source 
Reviewed-by: mbaesken, mchung
This commit is contained in:
Bob Vandette 2018-07-19 12:57:12 -04:00
parent 329374e53b
commit 6fc4db4799
2 changed files with 54 additions and 40 deletions
test
jdk/jdk/internal/platform/docker
MetricsCpuTester.java
lib/jdk/test/lib/containers/cgroup
MetricsTester.java

22
test/jdk/jdk/internal/platform/docker/MetricsCpuTester.java

@ -95,10 +95,13 @@ public class MetricsCpuTester {
+ Arrays.toString(ipCpuSet) + ", got : " + Arrays.toString(cpuSets));
}
if (!Arrays.equals(ipCpuSet, effectiveCpus)) {
throw new RuntimeException("Effective Cpusets not equal, expected : "
+ Arrays.toString(ipCpuSet) + ", got : "
+ Arrays.toString(effectiveCpus));
// Check to see if this metric is supported on this platform
if (effectiveCpus.length != 0) {
if (!Arrays.equals(ipCpuSet, effectiveCpus)) {
throw new RuntimeException("Effective Cpusets not equal, expected : "
+ Arrays.toString(ipCpuSet) + ", got : "
+ Arrays.toString(effectiveCpus));
}
}
System.out.println("TEST PASSED!!!");
}
@ -127,10 +130,13 @@ public class MetricsCpuTester {
+ Arrays.toString(cpuSets));
}
if (!Arrays.equals(ipCpuSet, effectiveMems)) {
throw new RuntimeException("Effective mem nodes not equal, expected : "
+ Arrays.toString(ipCpuSet) + ", got : "
+ Arrays.toString(effectiveMems));
// Check to see if this metric is supported on this platform
if (effectiveMems.length != 0) {
if (!Arrays.equals(ipCpuSet, effectiveMems)) {
throw new RuntimeException("Effective mem nodes not equal, expected : "
+ Arrays.toString(ipCpuSet) + ", got : "
+ Arrays.toString(effectiveMems));
}
}
System.out.println("TEST PASSED!!!");
}

72
test/lib/jdk/test/lib/containers/cgroup/MetricsTester.java

@ -150,7 +150,7 @@ public class MetricsTester {
try {
return new Scanner(new File(fname)).useDelimiter("\\Z").next();
} catch (FileNotFoundException e) {
System.err.println("Unale to open : " + fname);
System.err.println("Unable to open : " + fname);
return "";
}
}
@ -428,24 +428,27 @@ public class MetricsTester {
Arrays.toString(newVal));
}
int [] cpuSets = metrics.getEffectiveCpuSetCpus();
oldVal = Arrays.stream(metrics.getEffectiveCpuSetCpus()).boxed().toArray(Integer[]::new);
Arrays.sort(oldVal);
cpusstr = getFileContents(SubSystem.CPUSET, "cpuset.effective_cpus");
newVal = Stream.of(cpusstr.split(",")).flatMap(a -> {
if (a.contains("-")) {
String[] range = a.split("-");
return IntStream.rangeClosed(Integer.parseInt(range[0]),
Integer.parseInt(range[1])).boxed();
} else {
return Stream.of(Integer.parseInt(a));
// Skip this test if this metric is supported on this platform
if (cpuSets.length != 0) {
oldVal = Arrays.stream(cpuSets).boxed().toArray(Integer[]::new);
Arrays.sort(oldVal);
cpusstr = getFileContents(SubSystem.CPUSET, "cpuset.effective_cpus");
newVal = Stream.of(cpusstr.split(",")).flatMap(a -> {
if (a.contains("-")) {
String[] range = a.split("-");
return IntStream.rangeClosed(Integer.parseInt(range[0]),
Integer.parseInt(range[1])).boxed();
} else {
return Stream.of(Integer.parseInt(a));
}
}).toArray(Integer[]::new);
Arrays.sort(newVal);
if (Arrays.compare(oldVal, newVal) != 0) {
fail(SubSystem.CPUSET, "cpuset.effective_cpus", Arrays.toString(oldVal),
Arrays.toString(newVal));
}
}).toArray(Integer[]::new);
Arrays.sort(newVal);
if (Arrays.compare(oldVal, newVal) != 0) {
fail(SubSystem.CPUSET, "cpuset.effective_cpus", Arrays.toString(oldVal),
Arrays.toString(newVal));
}
oldVal = Arrays.stream(metrics.getCpuSetMems()).boxed().toArray(Integer[]::new);
@ -466,22 +469,27 @@ public class MetricsTester {
Arrays.toString(newVal));
}
oldVal = Arrays.stream(metrics.getEffectiveCpuSetMems()).boxed().toArray(Integer[]::new);
Arrays.sort(oldVal);
cpusstr = getFileContents(SubSystem.CPUSET, "cpuset.effective_mems");
newVal = Stream.of(cpusstr.split(",")).flatMap(a -> {
if (a.contains("-")) {
String[] range = a.split("-");
return IntStream.rangeClosed(Integer.parseInt(range[0]),
Integer.parseInt(range[1])).boxed();
} else {
return Stream.of(Integer.parseInt(a));
int [] cpuSetMems = metrics.getEffectiveCpuSetMems();
// Skip this test if this metric is supported on this platform
if (cpuSetMems.length != 0) {
oldVal = Arrays.stream(cpuSetMems).boxed().toArray(Integer[]::new);
Arrays.sort(oldVal);
cpusstr = getFileContents(SubSystem.CPUSET, "cpuset.effective_mems");
newVal = Stream.of(cpusstr.split(",")).flatMap(a -> {
if (a.contains("-")) {
String[] range = a.split("-");
return IntStream.rangeClosed(Integer.parseInt(range[0]),
Integer.parseInt(range[1])).boxed();
} else {
return Stream.of(Integer.parseInt(a));
}
}).toArray(Integer[]::new);
Arrays.sort(newVal);
if (Arrays.compare(oldVal, newVal) != 0) {
fail(SubSystem.CPUSET, "cpuset.effective_mems", Arrays.toString(oldVal),
Arrays.toString(newVal));
}
}).toArray(Integer[]::new);
Arrays.sort(newVal);
if (Arrays.compare(oldVal, newVal) != 0) {
fail(SubSystem.CPUSET, "cpuset.effective_mems", Arrays.toString(oldVal),
Arrays.toString(newVal));
}
double oldValue = metrics.getCpuSetMemoryPressure();