archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-15 08:34:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8228585: jdk/internal/platform/cgroup/TestCgroupMetrics.java - NumberFormatException because of large long values (memory limit_in_bytes)

Browse source 
Reviewed-by: dholmes, sgehwolf
This commit is contained in:
Matthias Baesken 2019-07-25 12:15:27 +02:00
parent ff6b5404eb
commit da6f042616
2 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/java.base/linux/classes/jdk/internal/platform/cgroupv1/SubSystem.java
View file

@ -132,7 +132,7 @@ public class SubSystem {
retval = Long.parseLong(strval); retval = Long.parseLong(strval);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
// For some properties (e.g. memory.limit_in_bytes) we may overflow the range of signed long. // For some properties (e.g. memory.limit_in_bytes) we may overflow the range of signed long.
// In this case, return Long.max // In this case, return Long.MAX_VALUE
BigInteger b = new BigInteger(strval); BigInteger b = new BigInteger(strval);
if (b.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) > 0) { if (b.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) > 0) {
return Long.MAX_VALUE; return Long.MAX_VALUE;

23
test/lib/jdk/test/lib/containers/cgroup/MetricsTester.java
View file

@ -26,6 +26,7 @@ package jdk.test.lib.containers.cgroup;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.math.BigInteger;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
@ -157,7 +158,24 @@ public class MetricsTester {
private static long getLongValueFromFile(SubSystem subSystem, String fileName) { private static long getLongValueFromFile(SubSystem subSystem, String fileName) {
String data = getFileContents(subSystem, fileName); String data = getFileContents(subSystem, fileName);
return data.isEmpty() ? 0L : Long.parseLong(data); return data.isEmpty() ? 0L : convertStringToLong(data);
}
private static long convertStringToLong(String strval) {
long retval = 0;
if (strval == null) return 0L;
try {
retval = Long.parseLong(strval);
} catch (NumberFormatException e) {
// For some properties (e.g. memory.limit_in_bytes) we may overflow the range of signed long.
// In this case, return Long.MAX_VALUE
BigInteger b = new BigInteger(strval);
if (b.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) > 0) {
return Long.MAX_VALUE;
}
}
return retval;
} }
private static long getLongValueFromFile(SubSystem subSystem, String metric, String subMetric) { private static long getLongValueFromFile(SubSystem subSystem, String metric, String subMetric) {
@ -165,7 +183,8 @@ public class MetricsTester {
String[] tokens = stats.split("[\\r\\n]+"); String[] tokens = stats.split("[\\r\\n]+");
for (int i = 0; i < tokens.length; i++) { for (int i = 0; i < tokens.length; i++) {
if (tokens[i].startsWith(subMetric)) { if (tokens[i].startsWith(subMetric)) {
return Long.parseLong(tokens[i].split("\\s+")[1]); String strval = tokens[i].split("\\s+")[1];
return convertStringToLong(strval);
} }
} }
return 0L; return 0L;