ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiw...@apache.org
Subject ambari git commit: AMBARI-11741. HDFS Dashboard is incorrectly showing 'Upgrade not finalized' when NameNode JMX data not available.(xiwang)
Date Fri, 31 Jul 2015 18:03:24 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 3a2381f58 -> 106360707


AMBARI-11741. HDFS Dashboard is incorrectly showing 'Upgrade not finalized' when NameNode
JMX data not available.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/10636070
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/10636070
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/10636070

Branch: refs/heads/trunk
Commit: 1063607070ddc488952c5ff23f07eb6293f8bb64
Parents: 3a2381f
Author: Xi Wang <xiwang@apache.org>
Authored: Thu Jul 30 14:48:22 2015 -0700
Committer: Xi Wang <xiwang@apache.org>
Committed: Fri Jul 31 11:03:40 2015 -0700

----------------------------------------------------------------------
 ambari-web/app/models/service/hdfs.js              | 2 +-
 ambari-web/app/views/main/service/services/hdfs.js | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/10636070/ambari-web/app/models/service/hdfs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service/hdfs.js b/ambari-web/app/models/service/hdfs.js
index fef47d8..dbeefe8 100644
--- a/ambari-web/app/models/service/hdfs.js
+++ b/ambari-web/app/models/service/hdfs.js
@@ -49,7 +49,7 @@ App.HDFSService = App.Service.extend({
   dfsMissingBlocks: DS.attr('number'),
   dfsUnderReplicatedBlocks: DS.attr('number'),
   dfsTotalFiles: DS.attr('number'),
-  upgradeStatus: DS.attr('boolean'),
+  upgradeStatus: DS.attr('string'),
   safeModeStatus: DS.attr('string'),
   nameNodeRpc: DS.attr('number'),
   metricsNotAvailable: DS.attr('boolean')

http://git-wip-us.apache.org/repos/asf/ambari/blob/10636070/ambari-web/app/views/main/service/services/hdfs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/services/hdfs.js b/ambari-web/app/views/main/service/services/hdfs.js
index e180ee8..c81f4a0 100644
--- a/ambari-web/app/views/main/service/services/hdfs.js
+++ b/ambari-web/app/views/main/service/services/hdfs.js
@@ -198,18 +198,19 @@ App.MainDashboardServiceHdfsView = App.MainDashboardServiceView.extend({
   upgradeStatus: function () {
     var upgradeStatus = this.get('service.upgradeStatus');
     var healthStatus = this.get('service.healthStatus');
-    if (upgradeStatus) {
+    if (upgradeStatus == 'true') {
       return Em.I18n.t('services.service.summary.pendingUpgradeStatus.notPending');
-    } else if (upgradeStatus == false && healthStatus == 'green') {
+    } else if (upgradeStatus == 'false' && healthStatus == 'green') {
       return Em.I18n.t('services.service.summary.pendingUpgradeStatus.notFinalized');
     } else {
+      // upgrade status == null
       return Em.I18n.t("services.service.summary.notAvailable");
     }
   }.property('service.upgradeStatus', 'service.healthStatus'),
   isUpgradeStatusWarning: function () {
     var upgradeStatus = this.get('service.upgradeStatus');
     var healthStatus = this.get('service.healthStatus');
-    return upgradeStatus == false && healthStatus == 'green';
+    return upgradeStatus == 'false' && healthStatus == 'green';
   }.property('service.upgradeStatus', 'service.healthStatus')
 
 });


Mime
View raw message