Browse Source

AMBARI-6072 Cpu usage widget stuck in loading when data is corrupted, second patch. (atkach)

atkach 11 years ago
parent
commit
f89181b42e
1 changed files with 11 additions and 1 deletions
  1. 11 1
      ambari-web/app/views/main/dashboard/cluster_metrics/cpu.js

+ 11 - 1
ambari-web/app/views/main/dashboard/cluster_metrics/cpu.js

@@ -36,14 +36,24 @@ App.ChartClusterMetricsCPU = App.ChartLinearTimeView.extend({
   isTimePagingDisable: true,
   isTimePagingDisable: true,
   transformToSeries: function (jsonData) {
   transformToSeries: function (jsonData) {
     var seriesArray = [];
     var seriesArray = [];
+    var idle = null;
+
     if (jsonData && jsonData.metrics && jsonData.metrics.cpu) {
     if (jsonData && jsonData.metrics && jsonData.metrics.cpu) {
-      for ( var name in jsonData.metrics.cpu) {
+      for (var name in jsonData.metrics.cpu) {
         var seriesData = jsonData.metrics.cpu[name];
         var seriesData = jsonData.metrics.cpu[name];
         if (seriesData) {
         if (seriesData) {
           var s = this.transformData(seriesData, name);
           var s = this.transformData(seriesData, name);
+          if (name === 'Idle') {
+            //CPU idle metric should be the last in series array
+            idle = s;
+            continue;
+          }
           seriesArray.push(s);
           seriesArray.push(s);
         }
         }
       }
       }
+      if (idle) {
+        seriesArray.push(idle);
+      }
     }
     }
     return seriesArray;
     return seriesArray;
   },
   },