src/java.base/linux/classes/jdk/internal/platform/cgroupv2/CgroupV2Subsystem.java

@  rev 57734 : Review feedback
|
o  rev 57733 : 8231111: Cgroups v2: Rework Metrics in java.base so as to recognize unified hierarchy
|  Reviewed-by: bobv, mchung
~
o  rev 56862 : 8231111: Cgroups v2: Rework Metrics in java.base so as to recognize unified hierarchy
|  Reviewed-by: bobv
~

@@ -32,11 +32,10 @@
 import java.util.stream.Collectors;
 
 import jdk.internal.platform.CgroupSubsystem;
 import jdk.internal.platform.CgroupSubsystemController;
 import jdk.internal.platform.CgroupUtil;
-import jdk.internal.platform.Metrics;
 
 public class CgroupV2Subsystem implements CgroupSubsystem {
 
     private final CgroupSubsystemController unified;
     private static final String PROVIDER_NAME = "cgroupv2";

@@ -94,33 +93,33 @@
 
     private long getFromCpuMax(int tokenIdx) {
         String cpuMaxRaw = CgroupSubsystemController.getStringValue(unified, "cpu.max");
         if (cpuMaxRaw == null) {
             // likely file not found
-            return Metrics.LONG_RETVAL_UNLIMITED;
+            return CgroupSubsystem.LONG_RETVAL_UNLIMITED;
         }
         // $MAX $PERIOD
         String[] tokens = cpuMaxRaw.split("\\s+");
         if (tokens.length != 2) {
-            return Metrics.LONG_RETVAL_UNLIMITED;
+            return CgroupSubsystem.LONG_RETVAL_UNLIMITED;
         }
         String quota = tokens[tokenIdx];
         return limitFromString(quota);
     }
 
     private long limitFromString(String strVal) {
         if (MAX_VAL.equals(strVal)) {
-            return Metrics.LONG_RETVAL_UNLIMITED;
+            return CgroupSubsystem.LONG_RETVAL_UNLIMITED;
         }
         return Long.parseLong(strVal);
     }
 
     @Override
     public long getCpuShares() {
         long sharesRaw = getLongVal("cpu.weight");
         if (sharesRaw == 100 || sharesRaw == 0) {
-            return Metrics.LONG_RETVAL_UNLIMITED;
+            return CgroupSubsystem.LONG_RETVAL_UNLIMITED;
         }
         int shares = (int)sharesRaw;
         // CPU shares (OCI) value needs to get translated into
         // a proper Cgroups v2 value. See:
         // https://github.com/containers/crun/blob/master/crun.1.md#cpu-controller

@@ -191,20 +190,10 @@
     public int[] getEffectiveCpuSetMems() {
         return CgroupSubsystemController.stringRangeToIntArray(CgroupSubsystemController.getStringValue(unified, "cpuset.mems.effective"));
     }
 
     @Override
-    public double getCpuSetMemoryPressure() {
-        return Metrics.DOUBLE_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
-    public Boolean isCpuSetMemoryPressureEnabled() {
-        return Metrics.BOOL_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
     public long getMemoryFailCount() {
         return CgroupSubsystemController.getLongEntry(unified, "memory.events", "max");
     }
 
     @Override

@@ -212,86 +201,31 @@
         String strVal = CgroupSubsystemController.getStringValue(unified, "memory.max");
         return limitFromString(strVal);
     }
 
     @Override
-    public long getMemoryMaxUsage() {
-        return Metrics.LONG_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
     public long getMemoryUsage() {
         return getLongVal("memory.current");
     }
 
     @Override
-    public long getKernelMemoryFailCount() {
-        return Metrics.LONG_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
-    public long getKernelMemoryLimit() {
-        return Metrics.LONG_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
-    public long getKernelMemoryMaxUsage() {
-        return Metrics.LONG_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
-    public long getKernelMemoryUsage() {
-        return Metrics.LONG_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
-    public long getTcpMemoryFailCount() {
-        return Metrics.LONG_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
-    public long getTcpMemoryLimit() {
-        return Metrics.LONG_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
-    public long getTcpMemoryMaxUsage() {
-        return Metrics.LONG_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
     public long getTcpMemoryUsage() {
         return CgroupSubsystemController.getLongEntry(unified, "memory.stat", "sock");
     }
 
     @Override
-    public long getMemoryAndSwapFailCount() {
-        return Metrics.LONG_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
     public long getMemoryAndSwapLimit() {
         String strVal = CgroupSubsystemController.getStringValue(unified, "memory.swap.max");
         return limitFromString(strVal);
     }
 
     @Override
-    public long getMemoryAndSwapMaxUsage() {
-        return Metrics.LONG_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
     public long getMemoryAndSwapUsage() {
         return getLongVal("memory.swap.current");
     }
 
     @Override
-    public Boolean isMemoryOOMKillEnabled() {
-        return Metrics.BOOL_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
     public long getMemorySoftLimit() {
         String softLimitStr = CgroupSubsystemController.getStringValue(unified, "memory.high");
         return limitFromString(softLimitStr);
     }
 

@@ -310,11 +244,11 @@
         try {
             return CgroupUtil.readFilePrivileged(Paths.get(unified.path(), "io.stat"))
                                 .map(mapFunc)
                                 .collect(Collectors.summingLong(e -> e));
         } catch (IOException e) {
-            return Metrics.LONG_RETVAL_NOT_SUPPORTED;
+            return CgroupSubsystem.LONG_RETVAL_NOT_SUPPORTED;
         }
     }
 
     private static String[] getRWIOMatchTokenNames() {
         return new String[] { "rios", "wios" };