You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by xi...@apache.org on 2015/06/06 02:51:12 UTC
[2/2] ambari git commit: AMBARI-11741. HDFS Dashboard is incorrectly
showing 'Upgrade not finalized' when NameNode JMX data not available.(xiwang)
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/105f203a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/105f203a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/105f203a
Branch: refs/heads/branch-2.1
Commit: 105f203af4ce5609623c7a67655bb93d76257fab
Parents: 214769e
Author: Xi Wang <xi...@apache.org>
Authored: Fri Jun 5 15:41:22 2015 -0700
Committer: Xi Wang <xi...@apache.org>
Committed: Fri Jun 5 17:51:17 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/105f203a/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')
});