Prechádzať zdrojové kódy

AMBARI-3645. HA cluster: some dashboard's widgets contain 'Null', 'NaN' values after services stop. (xiwang)

Xi Wang 11 rokov pred
rodič
commit
aa2df114bf

+ 2 - 2
ambari-web/app/views/main/dashboard/service/hbase.js

@@ -96,7 +96,7 @@ App.MainDashboardServiceHbaseView = App.MainDashboardServiceView.extend({
 
   summaryHeader: function () {
     var avgLoad = this.get('service.averageLoad');
-    if (avgLoad == null) {
+    if (isNaN(avgLoad)) {
       avgLoad = this.t("services.service.summary.unknown");
     }
     return this.t("dashboard.services.hbase.summary").format(this.get('service.regionServers.length'), avgLoad);
@@ -110,7 +110,7 @@ App.MainDashboardServiceHbaseView = App.MainDashboardServiceView.extend({
 
   averageLoad: function () {
     var avgLoad = this.get('service.averageLoad');
-    if (avgLoad == null) {
+    if (isNaN(avgLoad)) {
       avgLoad = this.t('services.service.summary.notAvailable');
     }
     return this.t('dashboard.services.hbase.averageLoadPerServer').format(avgLoad);

+ 1 - 1
ambari-web/app/views/main/dashboard/widgets/hbase_average_load.js

@@ -26,7 +26,7 @@ App.HBaseAverageLoadView = App.TextDashboardWidgetView.extend({
   model_type: 'hbase',
   hiddenInfo: function () {
     var avgLoad = this.get('model.averageLoad');
-    if (avgLoad == null) {
+    if (isNaN(avgLoad)) {
       avgLoad = Em.I18n.t('services.service.summary.notAvailable');
     }
     var result = [];

+ 5 - 5
ambari-web/app/views/main/dashboard/widgets/node_managers_live.js

@@ -26,11 +26,11 @@ App.NodeManagersLiveView = App.TextDashboardWidgetView.extend({
   model_type: 'yarn',
 
   hiddenInfo: function () {
-    var nmActive = this.get('model.nodeManagersCountActive');
-    var nmLost = this.get('model.nodeManagersCountLost');
-    var nmUnhealthy = this.get('model.nodeManagersCountUnhealthy');
-    var nmRebooted = this.get('model.nodeManagersCountRebooted');
-    var nmDecom = this.get('model.nodeManagersCountDecommissioned');
+    var nmActive = this.get('model.nodeManagersCountActive') == null ? Em.I18n.t('services.service.summary.notAvailable') : this.get('model.nodeManagersCountActive');
+    var nmLost = this.get('model.nodeManagersCountLost') == null ? Em.I18n.t('services.service.summary.notAvailable') : this.get('model.nodeManagersCountLost');
+    var nmUnhealthy = this.get('model.nodeManagersCountUnhealthy') == null ? Em.I18n.t('services.service.summary.notAvailable') : this.get('model.nodeManagersCountUnhealthy');
+    var nmRebooted = this.get('model.nodeManagersCountRebooted') == null ? Em.I18n.t('services.service.summary.notAvailable'): this.get('model.nodeManagersCountRebooted');
+    var nmDecom = this.get('model.nodeManagersCountDecommissioned') == null ? Em.I18n.t('services.service.summary.notAvailable') : this.get('model.nodeManagersCountDecommissioned');
     var result = [];
       result.pushObject(nmActive + " active");
       result.pushObject(nmLost + " lost");