1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8212528: Wrong cgroup subsystem being used for some CPU Container Metrics

Browse Source 
Reviewed-by: rriggs, sgehwolf
This commit is contained in:
Bob Vandette 2019-03-19 12:10:00 -04:00
parent e97e09288e
commit adc6d241ba
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/java.base/linux/classes/jdk/internal/platform/cgroupv1/Metrics.java
View File

@ -298,15 +298,15 @@ public class Metrics implements jdk.internal.platform.Metrics {
public long getCpuPeriod() { public long getCpuPeriod() {
return SubSystem.getLongValue(cpuacct, "cpu.cfs_period_us"); return SubSystem.getLongValue(cpu, "cpu.cfs_period_us");
} }
public long getCpuQuota() { public long getCpuQuota() {
return SubSystem.getLongValue(cpuacct, "cpu.cfs_quota_us"); return SubSystem.getLongValue(cpu, "cpu.cfs_quota_us");
} }
public long getCpuShares() { public long getCpuShares() {
long retval = SubSystem.getLongValue(cpuacct, "cpu.shares"); long retval = SubSystem.getLongValue(cpu, "cpu.shares");
if (retval == 0 || retval == 1024) if (retval == 0 || retval == 1024)
return -1; return -1;
else else
@ -314,15 +314,15 @@ public class Metrics implements jdk.internal.platform.Metrics {
} }
public long getCpuNumPeriods() { public long getCpuNumPeriods() {
return SubSystem.getLongEntry(cpuacct, "cpu.stat", "nr_periods"); return SubSystem.getLongEntry(cpu, "cpu.stat", "nr_periods");
} }
public long getCpuNumThrottled() { public long getCpuNumThrottled() {
return SubSystem.getLongEntry(cpuacct, "cpu.stat", "nr_throttled"); return SubSystem.getLongEntry(cpu, "cpu.stat", "nr_throttled");
} }
public long getCpuThrottledTime() { public long getCpuThrottledTime() {
return SubSystem.getLongEntry(cpuacct, "cpu.stat", "throttled_time"); return SubSystem.getLongEntry(cpu, "cpu.stat", "throttled_time");
} }
public long getEffectiveCpuCount() { public long getEffectiveCpuCount() {