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:11 UTC
[1/2] ambari git commit: AMBARI-11742. HDFS Dashboard shows incorrect
info regarding DataNodes when NameNode JMX is not available.(XIWANG)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 4d112e949 -> 105f203af
AMBARI-11742. HDFS Dashboard shows incorrect info regarding DataNodes when NameNode JMX is 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/214769e9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/214769e9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/214769e9
Branch: refs/heads/branch-2.1
Commit: 214769e90743a681bddaa63e659bb28afaa9f1d7
Parents: 4d112e9
Author: Xi Wang <xi...@apache.org>
Authored: Fri Jun 5 17:23:26 2015 -0700
Committer: Xi Wang <xi...@apache.org>
Committed: Fri Jun 5 17:50:35 2015 -0700
----------------------------------------------------------------------
.../templates/main/service/services/hdfs.hbs | 42 +++++++++++---------
1 file changed, 23 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/214769e9/ambari-web/app/templates/main/service/services/hdfs.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/services/hdfs.hbs b/ambari-web/app/templates/main/service/services/hdfs.hbs
index 11fd24b..aac2379 100644
--- a/ambari-web/app/templates/main/service/services/hdfs.hbs
+++ b/ambari-web/app/templates/main/service/services/hdfs.hbs
@@ -29,28 +29,18 @@
{{t common.started}}
</td>
</tr>
-<!-- NFS Gateway -->
-{{#if view.isNfsInStack}}
- <tr>
- <td class="summary-label"><a href="#" {{action filterHosts view.nfsGatewayComponent}}>{{t dashboard.services.hdfs.nfsgateways}}</a></td>
- <td>
- <span>
- {{#view App.ComponentLiveTextView liveComponentsBinding="view.service.nfsGatewaysStarted" totalComponentsBinding="view.service.nfsGatewaysTotal"}}
- {{view.liveComponents}}/{{view.totalComponents}}
- {{/view}}
- </span>
- {{t common.started}}
- </td>
- </tr>
-{{/if}}
<!-- Data Node Counts -->
<tr>
<td class="summary-label">{{t dashboard.services.hdfs.datanodecounts}}</td>
- <td>
- <span {{translateAttr data-original-title="dashboard.services.hdfs.datanode.status.tooltip.live" }} rel="tooltip">{{view.service.liveDataNodes.length}} {{t dashboard.services.hdfs.nodes.live}} </span> /
- <span {{translateAttr data-original-title="dashboard.services.hdfs.datanode.status.tooltip.dead" }} rel="tooltip">{{view.service.deadDataNodes.length}} {{t dashboard.services.hdfs.nodes.dead}} </span> /
- <span {{translateAttr data-original-title="dashboard.services.hdfs.datanode.status.tooltip.decommission" }} rel="tooltip">{{view.service.decommissionDataNodes.length}} {{t dashboard.services.hdfs.nodes.decom}}</span>
- </td>
+ {{#if view.service.metricsNotAvailable}}
+ <td>{{t services.service.summary.notAvailable}}</td>
+ {{else}}
+ <td>
+ <span {{translateAttr data-original-title="dashboard.services.hdfs.datanode.status.tooltip.live" }} rel="tooltip">{{view.service.liveDataNodes.length}} {{t dashboard.services.hdfs.nodes.live}} </span> /
+ <span {{translateAttr data-original-title="dashboard.services.hdfs.datanode.status.tooltip.dead" }} rel="tooltip">{{view.service.deadDataNodes.length}} {{t dashboard.services.hdfs.nodes.dead}} </span> /
+ <span {{translateAttr data-original-title="dashboard.services.hdfs.datanode.status.tooltip.decommission" }} rel="tooltip">{{view.service.decommissionDataNodes.length}} {{t dashboard.services.hdfs.nodes.decom}}</span>
+ </td>
+ {{/if}}
</tr>
<!-- JournalNodes -->
{{#if view.showJournalNodes}}
@@ -67,6 +57,20 @@
</td>
</tr>
{{/if}}
+<!-- NFS Gateway -->
+{{#if view.isNfsInStack}}
+ <tr>
+ <td class="summary-label"><a href="#" {{action filterHosts view.nfsGatewayComponent}}>{{t dashboard.services.hdfs.nfsgateways}}</a></td>
+ <td>
+ <span>
+ {{#view App.ComponentLiveTextView liveComponentsBinding="view.service.nfsGatewaysStarted" totalComponentsBinding="view.service.nfsGatewaysTotal"}}
+ {{view.liveComponents}}/{{view.totalComponents}}
+ {{/view}}
+ </span>
+ {{t common.started}}
+ </td>
+ </tr>
+{{/if}}
<!-- NameNode Uptime -->
<tr>
<td class="summary-label">{{t dashboard.services.hdfs.nodes.uptime}}</td>
[2/2] ambari git commit: AMBARI-11741. HDFS Dashboard is incorrectly
showing 'Upgrade not finalized' when NameNode JMX data not available.(xiwang)
Posted by xi...@apache.org.
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')
});