test/jdk/jdk/internal/platform/docker/MetricsMemoryTester.java

@  rev 57735 : Review feedback 2
|
o  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
~

*** 22,32 ****
   */
  
  import java.util.Arrays;
  
  import jdk.internal.platform.Metrics;
! import jdk.internal.platform.MetricsCgroupV1;
  
  public class MetricsMemoryTester {
      public static void main(String[] args) {
          System.out.println(Arrays.toString(args));
          switch (args[0]) {
--- 22,32 ----
   */
  
  import java.util.Arrays;
  
  import jdk.internal.platform.Metrics;
! import jdk.internal.platform.CgroupV1Metrics;
  
  public class MetricsMemoryTester {
      public static void main(String[] args) {
          System.out.println(Arrays.toString(args));
          switch (args[0]) {
*** 108,119 ****
          System.out.println("TEST PASSED!!!");
      }
  
      private static void testKernelMemoryLimit(String value) {
          Metrics m = Metrics.systemMetrics();
!         if (m instanceof MetricsCgroupV1) {
!             MetricsCgroupV1 mCgroupV1 = (MetricsCgroupV1)m;
              System.out.println("TEST PASSED!!!");
              long limit = getMemoryValue(value);
              long kmemlimit = mCgroupV1.getKernelMemoryLimit();
              if (kmemlimit != 0 && limit != kmemlimit) {
                  throw new RuntimeException("Kernel Memory limit not equal, expected : ["
--- 108,119 ----
          System.out.println("TEST PASSED!!!");
      }
  
      private static void testKernelMemoryLimit(String value) {
          Metrics m = Metrics.systemMetrics();
!         if (m instanceof CgroupV1Metrics) {
!             CgroupV1Metrics mCgroupV1 = (CgroupV1Metrics)m;
              System.out.println("TEST PASSED!!!");
              long limit = getMemoryValue(value);
              long kmemlimit = mCgroupV1.getKernelMemoryLimit();
              if (kmemlimit != 0 && limit != kmemlimit) {
                  throw new RuntimeException("Kernel Memory limit not equal, expected : ["
*** 153,164 ****
          return result;
      }
  
      private static void testOomKillFlag(boolean oomKillFlag) {
          Metrics m = Metrics.systemMetrics();
!         if (m instanceof MetricsCgroupV1) {
!             MetricsCgroupV1 mCgroupV1 = (MetricsCgroupV1)m;
              Boolean expected = Boolean.valueOf(oomKillFlag);
              Boolean actual = mCgroupV1.isMemoryOOMKillEnabled();
              if (!(expected.equals(actual))) {
                  throw new RuntimeException("oomKillFlag error");
              }
--- 153,164 ----
          return result;
      }
  
      private static void testOomKillFlag(boolean oomKillFlag) {
          Metrics m = Metrics.systemMetrics();
!         if (m instanceof CgroupV1Metrics) {
!             CgroupV1Metrics mCgroupV1 = (CgroupV1Metrics)m;
              Boolean expected = Boolean.valueOf(oomKillFlag);
              Boolean actual = mCgroupV1.isMemoryOOMKillEnabled();
              if (!(expected.equals(actual))) {
                  throw new RuntimeException("oomKillFlag error");
              }