AMBARI-2107. Cluster CPU Chart is off the charts. Reopened. (swagle)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1483445 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -854,6 +854,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2107. Cluster CPU Chart is off the charts. Reopened. (swagle)
+
  AMBARI-2139. Hive Service check fails on secure cluster. (jaimin)
 
  AMBARI-2138. HBase smoke test fails on secure cluster. (swagle)

ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaMetric.java

@@ -71,11 +71,11 @@ public class GangliaMetric {
   static {
     Set<String> temp = new HashSet<String>();
     temp.add("cpu_wio");
-    /*temp.add("cpu_idle");
+    temp.add("cpu_idle");
     temp.add("cpu_nice");
     temp.add("cpu_aidle");
     temp.add("cpu_system");
-    temp.add("cpu_user");*/
+    temp.add("cpu_user");
     PERCENTAGE_METRIC = Collections.unmodifiableSet(temp);
   }
 
@@ -214,18 +214,18 @@ public class GangliaMetric {
   public static class TemporalMetric {
     private Number m_value;
     private Number m_time;
-    private boolean isInvalid;
+    private boolean valid;
 
-    public boolean isIsInvalid() {
-      return isInvalid;
+    public boolean isValid() {
+      return valid;
     }
 
     public TemporalMetric(String value, Number time) {
-      isInvalid = false;
+      valid = true;
       try{
         m_value = convertToNumber(value);
       } catch (NumberFormatException e) {
-        isInvalid = true;
+        valid = false;
       }
       m_time = time;
     }

ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java

@@ -414,7 +414,7 @@ public abstract class GangliaPropertyProvider extends AbstractPropertyProvider {
           String val = reader.readLine();
           while(! val.equals("[AMBARI_DP_END]")) {
             GangliaMetric.TemporalMetric tm = new GangliaMetric.TemporalMetric(val, time);
-            if (!tm.isIsInvalid()) listTemporalMetrics.add(tm);
+            if (tm.isValid()) listTemporalMetrics.add(tm);
             time += step;
             val = reader.readLine();
           }

ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaMetricTest.java

@@ -97,7 +97,7 @@ public class GangliaMetricTest {
     System.out.println("GangliaMetric.TemporalMetric");
     GangliaMetric.TemporalMetric tm;
     tm = new GangliaMetric.TemporalMetric("100", new Long(1362440880));
-    assertFalse("GangliaMetric.TemporalMetric is valid", tm.isIsInvalid());
+    assertTrue("GangliaMetric.TemporalMetric is valid", tm.isValid());
   }
 
     /**
@@ -108,7 +108,7 @@ public class GangliaMetricTest {
     System.out.println("GangliaMetric.TemporalMetric");
     GangliaMetric.TemporalMetric tm;
     tm = new GangliaMetric.TemporalMetric("any string", new Long(1362440880));
-    assertTrue("GangliaMetric.TemporalMetric is invalid", tm.isIsInvalid());
+    assertFalse("GangliaMetric.TemporalMetric is invalid", tm.isValid());
   }