fix cpuUsage type

apache · Jul 28, 2022 · 3e6d1b7 · 3e6d1b7
1 parent 92b41b6
commit 3e6d1b7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LinuxInfoUtils.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LinuxInfoUtils.java
@@ -122,11 +122,11 @@ public static double getTotalCpuLimit(boolean isCGroupsEnabled) {
      * @return Cpu usage
      */
     @SneakyThrows
-    public static double getCpuUsageForCGroup() {
+    public static long getCpuUsageForCGroup() {
         if (getCpuUsageMethod == null) {
             return  -1;
         }
-        return (double) getCpuUsageMethod.invoke(metrics);
+        return (long) getCpuUsageMethod.invoke(metrics);
     }
 
 

diff --git a/...ker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LinuxBrokerHostUsageImpl.java b/...ker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LinuxBrokerHostUsageImpl.java
@@ -137,7 +137,7 @@ private double getTotalCpuUsage(double elapsedTimeSeconds) {
     }
 
     private double getTotalCpuUsageForCGroup(double elapsedTimeSeconds) {
-        double usage = getCpuUsageForCGroup();
+        double usage = (double) getCpuUsageForCGroup();
         double currentUsage = usage - lastCpuUsage;
         lastCpuUsage = usage;
         return 100 * currentUsage / elapsedTimeSeconds / TimeUnit.SECONDS.toNanos(1);

diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/SimpleBrokerStartTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/SimpleBrokerStartTest.java
@@ -118,7 +118,7 @@ public void testCGroupMetrics() throws IOException {
         Assert.assertEquals(totalCpuLimit, expectTotalCpuLimit);
 
         if (cGroupEnabled) {
-            double cpuUsageForCGroup = LinuxInfoUtils.getCpuUsageForCGroup();
+            long cpuUsageForCGroup = LinuxInfoUtils.getCpuUsageForCGroup();
             log.info("cpuUsageForCGroup: {}", cpuUsageForCGroup);
         }
     }