ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiw...@apache.org
Subject [2/2] ambari git commit: AMBARI-11742. HDFS Dashboard shows incorrect info regarding DataNodes when NameNode JMX is not available.(XIWANG)
Date Sat, 06 Jun 2015 00:48:59 GMT
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/89ba4a4b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/89ba4a4b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/89ba4a4b

Branch: refs/heads/trunk
Commit: 89ba4a4bbcb64ad802bc94fa356c2f180e774ca5
Parents: bf408fb
Author: Xi Wang <xiwang@apache.org>
Authored: Fri Jun 5 17:23:26 2015 -0700
Committer: Xi Wang <xiwang@apache.org>
Committed: Fri Jun 5 17:23:26 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/89ba4a4b/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>


Mime
View raw message