ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiw...@apache.org
Subject [1/2] ambari git commit: AMBARI-11741. HDFS Dashboard is incorrectly showing 'Upgrade not finalized' when NameNode JMX data not available.(xiwang)
Date Sat, 06 Jun 2015 00:48:58 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk f42450910 -> 89ba4a4bb


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/bf408fb4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bf408fb4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bf408fb4

Branch: refs/heads/trunk
Commit: bf408fb48701861b9efea61d4b402ebe34727915
Parents: f424509
Author: Xi Wang <xiwang@apache.org>
Authored: Fri Jun 5 15:41:22 2015 -0700
Committer: Xi Wang <xiwang@apache.org>
Committed: Fri Jun 5 15:42:19 2015 -0700

----------------------------------------------------------------------
 ambari-web/app/views/main/service/services/hdfs.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/bf408fb4/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 ba58947..d70b454 100644
--- a/ambari-web/app/views/main/service/services/hdfs.js
+++ b/ambari-web/app/views/main/service/services/hdfs.js
@@ -218,7 +218,7 @@ App.MainDashboardServiceHdfsView = App.MainDashboardServiceView.extend({
     var healthStatus = this.get('service.healthStatus');
     if (upgradeStatus) {
       return Em.I18n.t('services.service.summary.pendingUpgradeStatus.notPending');
-    } else if (healthStatus == 'green') {
+    } else if (upgradeStatus == false && healthStatus == 'green') {
       return Em.I18n.t('services.service.summary.pendingUpgradeStatus.notFinalized');
     } else {
       return Em.I18n.t("services.service.summary.notAvailable");
@@ -227,7 +227,7 @@ App.MainDashboardServiceHdfsView = App.MainDashboardServiceView.extend({
   isUpgradeStatusWarning: function () {
     var upgradeStatus = this.get('service.upgradeStatus');
     var healthStatus = this.get('service.healthStatus');
-    return !upgradeStatus && healthStatus == 'green';
+    return upgradeStatus == false && healthStatus == 'green';
   }.property('service.upgradeStatus', 'service.healthStatus')
 
 });


Mime
View raw message