Remove the use of CPU health indicator. (#454)

Netflix · Jan 12, 2017 · bc694bf · bc694bf
1 parent 99a9d78
commit bc694bf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/genie-web/src/main/java/com/netflix/genie/web/health/GenieCpuHealthIndicator.java b/genie-web/src/main/java/com/netflix/genie/web/health/GenieCpuHealthIndicator.java
@@ -27,7 +27,6 @@
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.scheduling.TaskScheduler;
-import org.springframework.stereotype.Component;
 
 import javax.validation.constraints.NotNull;
 import java.lang.management.ManagementFactory;
@@ -37,7 +36,6 @@
  * @author amajumdar
  * @since 3.0.0
  */
-@Component
 @Slf4j
 public class GenieCpuHealthIndicator implements HealthIndicator {
     private static final String CPU_LOAD = "cpuLoad";
@@ -86,7 +84,7 @@ public Health health() {
         final long cpuCount = summaryCpuMetric.getCount();
         final long cpuTotal = summaryCpuMetric.getTotalAmount();
         final double currentCpuLoadPercent =
-            cpuCount == 0 ? operatingSystemMXBean.getProcessCpuLoad() : (cpuTotal / (double) cpuCount);
+            cpuCount == 0 ? operatingSystemMXBean.getSystemCpuLoad() : (cpuTotal / (double) cpuCount);
         if (currentCpuLoadPercent > maxCpuLoadPercent) {
             cpuLoadConsecutiveOccurrences++;
         } else {

diff --git a/genie-web/src/test/groovy/com/netflix/genie/web/health/GenieCpuHealthIndicatorSpec.groovy b/genie-web/src/test/groovy/com/netflix/genie/web/health/GenieCpuHealthIndicatorSpec.groovy
@@ -54,14 +54,14 @@ class GenieCpuHealthIndicatorSpec extends Specification{
     def checkHealth(){
         when:
         def okOperatingSystemMXBean = Mock(OperatingSystemMXBean)
-        okOperatingSystemMXBean.getSystemCpuLoad() >> 0.75 >> 0.78
+        okOperatingSystemMXBean.getSystemCpuLoad() >> 0.75
         def indicator = new GenieCpuHealthIndicator( 80, 1, okOperatingSystemMXBean,
                 new BasicDistributionSummary(MonitorConfig.builder('s').build()), new DefaultManagedTaskScheduler())
         then:
         indicator.health().getStatus() == Status.UP
         when:
         def outOperatingSystemMXBean = Mock(OperatingSystemMXBean)
-        outOperatingSystemMXBean.getSystemCpuLoad() >> 0.85 >> 0.88
+        outOperatingSystemMXBean.getSystemCpuLoad() >> 0.85
         indicator = new GenieCpuHealthIndicator( 80, 1, outOperatingSystemMXBean,
                 new BasicDistributionSummary(MonitorConfig.builder('s').build()), new DefaultManagedTaskScheduler())
         then: