Etusivu Tutki Apua
Rekisteröidy Kirjaudu sisään
apache
/
hadoop
peilaus alkaen https://github.com/apache/hadoop.git
2
0
Fork 1
Tiedostot Ongelmat 0 Wiki
Selaa lähdekoodia

HDFS-5748. Too much information shown in the dfs health page. Contributed by Haohui Mai

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1560215 13f79535-47bb-0310-9956-ffa450edef68
Brandon Li 11 vuotta sitten
vanhempi
d1963ad4bd
commit
cc7cc5a4d9
4 muutettua tiedostoa jossa 336 lisäystä ja 272 poistoa
Yhdistetty näkymä Näytä diff tilastot
  1. 3 0
      hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
  2. 200 217
      hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
  3. 113 55
      hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
  4. 20 0
      hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/hadoop.css

+ 3 - 0
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Näytä tiedosto 

@@ -778,6 +778,9 @@ Release 2.4.0 - UNRELEASED
 
     HDFS-5800. Fix a typo in DFSClient.renewLease().  (Kousuke Saruta
 
     HDFS-5800. Fix a typo in DFSClient.renewLease().  (Kousuke Saruta
 
     via szetszwo)
 
     via szetszwo)
 
 
 
+    HDFS-5748. Too much information shown in the dfs health page.
 
+    (Haohui Mai via brandonli)
 
+
 
   BREAKDOWN OF HDFS-2832 SUBTASKS AND RELATED JIRAS
 
   BREAKDOWN OF HDFS-2832 SUBTASKS AND RELATED JIRAS
 
 
 
     HDFS-4985. Add storage type to the protocol and expose it in block report
 
     HDFS-4985. Add storage type to the protocol and expose it in block report

+ 200 - 217
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
Näytä tiedosto 

@@ -23,25 +23,53 @@
 
 <title>Namenode information</title>
 
 <title>Namenode information</title>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
+
 
+<header class="navbar navbar-inverse bs-docs-nav" role="banner">
 
+<div class="container">
 
+  <div class="navbar-header">
 
+    <a href="http://hadoop.apache.org/core" class="navbar-brand">Hadoop</a>
 
+  </div>
 
+
 
+  <ul class="nav navbar-nav" id="ui-tabs">
 
+    <li><a href="#tab-overview">Overview</a></li>
 
+    <li><a href="#tab-datanode">Datanodes</a></li>
 
+    <li><a href="#tab-snapshot">Snapshot</a></li>
 
+    <li><a href="#tab-startup-progress">Startup Progress</a></li>
 
+    <li class="dropdown">
 
+      <a href="#" class="dropdown-toggle" data-toggle="dropdown">Utilities <b class="caret"></b></a>
 
+      <ul class="dropdown-menu">
 
+        <li><a href="explorer.html">Browse the file system</a></li>
 
+        <li><a href="logs">Logs</a></li>
 
+      </ul>
 
+    </li>
 
+  </ul>
 
+</div>
 
+</header>
 
+
 
 <div class="container">
 
 <div class="container">
 
-<div class="alert alert-danger" id="alert-panel" style="display:none">
 
-<button type="button" class="close" onclick="$('#alert-panel').hide();">&times;</button>
 
-<div class="alert-body" id="alert-panel-body"></div>
 
+
 
+<div id="alert-panel">
 
+  <div class="alert alert-danger">
 
+    <button type="button" class="close" onclick="$('#alert-panel').hide();">&times;</button>
 
+    <div class="alert-body" id="alert-panel-body"></div>
 
+  </div>
 
 </div>
 
 </div>
 
-<div id="panel"></div>
 
+
 
+<div class="tab-content">
 
+  <div class="tab-pane" id="tab-overview"></div>
 
+  <div class="tab-pane" id="tab-datanode"></div>
 
+  <div class="tab-pane" id="tab-snapshot"></div>
 
+  <div class="tab-pane" id="tab-startup-progress"></div>
 
 </div>
 
 </div>
 
+
 
 <div class="row">
 
 <div class="row">
 
-<hr />
 
-<div class="col-xs-2"><p><a href="http://hadoop.apache.org/core">Hadoop</a>, 2013.</p></div>
 
-<div class="col-xs-1 pull-right"><a style="color: #ddd" href="dfshealth.jsp">Legacy UI</a></div>
 
+  <hr />
 
+  <div class="col-xs-2"><p><a href="http://hadoop.apache.org/core">Hadoop</a>, 2014.</p></div>
 
+  <div class="col-xs-1 pull-right"><a style="color: #ddd" href="dfshealth.jsp">Legacy UI</a></div>
 
+</div>
 
 </div>
 
 </div>
 
 
 
 <script type="text/x-dust-template" id="tmpl-dfshealth">
 
 <script type="text/x-dust-template" id="tmpl-dfshealth">
 
-<div class="page-header">
 
-  {#nnstat}
 
-  <h1>NameNode '{HostAndPort}' ({State})</h1>
 
-  {/nnstat}
 
-</div>
 
 
 
 {#nn}
 
 {#nn}
 
 {@if cond="{DistinctVersionCount} > 1"}
 
 {@if cond="{DistinctVersionCount} > 1"}
 
@@ -71,238 +99,193 @@
 
 {/if}
 
 {/if}
 
 {/nn}
 
 {/nn}
 
 
 
-<div class="panel panel-success">
 
-  <div class="panel-heading">Overview</div>
 
-  <div class="panel-body">
 
-    {#nn}
 
-    <table class="table table-bordered">
 
-      <tr><th>Started:</th><td>{NNStarted}</td></tr>
 
-      <tr><th>Version:</th><td>{Version}</td></tr>
 
-      <tr><th>Compiled:</th><td>{CompileInfo}</td></tr>
 
-      <tr><th>Cluster ID:</th><td>{ClusterId}</td></tr>
 
-      <tr><th>Block Pool ID:</th><td>{BlockPoolId}</td></tr>
 
-    </table>
 
-    {/nn}
 
-  </div>
 
-</div>
 
-
 
-<p><a href="explorer.html">Browse the filesystem</a></p>
 
-<p><a href="/logs/">NameNode Logs</a></p>
 
-
 
-<hr/>
 
-
 
-<div class="panel panel-success">
 
-  <div class="panel-heading">Cluster Summary</div>
 
-  <div class="panel-body">
 
+<div class="page-header"><h1>Overview {#nnstat}<small>'{HostAndPort}' ({State})</small>{/nnstat}</h1></div>
 
+{#nn}
 
+<table class="table table-bordered table-striped">
 
+  <tr><th>Started:</th><td>{NNStarted}</td></tr>
 
+  <tr><th>Version:</th><td>{Version}</td></tr>
 
+  <tr><th>Compiled:</th><td>{CompileInfo}</td></tr>
 
+  <tr><th>Cluster ID:</th><td>{ClusterId}</td></tr>
 
+  <tr><th>Block Pool ID:</th><td>{BlockPoolId}</td></tr>
 
+</table>
 
+{/nn}
 
 
 
-    <p>
 
-      Security is {#nnstat}{#SecurityEnabled}on{:else}off{/SecurityEnabled}{/nnstat}.</p>
 
-    <p>{#nn}{#Safemode}{.}{:else}Safemode is off.{/Safemode}{/nn}</p>
 
+<div class="page-header"><h1>Summary</h1></div>
 
+<p>
 
+  Security is {#nnstat}{#SecurityEnabled}on{:else}off{/SecurityEnabled}{/nnstat}.</p>
 
+<p>{#nn}{#Safemode}{.}{:else}Safemode is off.{/Safemode}{/nn}</p>
 
 
 
-    <p>
 
-      {#fs}
 
-      {FilesTotal} files and directories, {BlocksTotal} blocks = {@math key="{FilesTotal}" method="add" operand="{BlocksTotal}"/} total filesystem object(s).
 
-      {#helper_fs_max_objects/}
 
-      {/fs}
 
-    </p>
 
-    {#mem.HeapMemoryUsage}
 
-    <p>Heap Memory used {used|fmt_bytes} of {committed|fmt_bytes} Heap Memory. Max Heap Memory is {max|fmt_bytes}. </p>
 
-    {/mem.HeapMemoryUsage}
 
+<p>
 
+  {#fs}
 
+  {FilesTotal} files and directories, {BlocksTotal} blocks = {@math key="{FilesTotal}" method="add" operand="{BlocksTotal}"/} total filesystem object(s).
 
+  {#helper_fs_max_objects/}
 
+  {/fs}
 
+</p>
 
+{#mem.HeapMemoryUsage}
 
+<p>Heap Memory used {used|fmt_bytes} of {committed|fmt_bytes} Heap Memory. Max Heap Memory is {max|fmt_bytes}. </p>
 
+{/mem.HeapMemoryUsage}
 
 
 
-    {#mem.NonHeapMemoryUsage}
 
-    <p>Non Heap Memory used {used|fmt_bytes} of {committed|fmt_bytes} Commited Non Heap Memory. Max Non Heap Memory is {max|fmt_bytes}. </p>
 
-    {/mem.NonHeapMemoryUsage}
 
+{#mem.NonHeapMemoryUsage}
 
+<p>Non Heap Memory used {used|fmt_bytes} of {committed|fmt_bytes} Commited Non Heap Memory. Max Non Heap Memory is {max|fmt_bytes}. </p>
 
+{/mem.NonHeapMemoryUsage}
 
 
 
-    {#nn}
 
-    <table class="table table-bordered table-striped">
 
-      <tr><th> Configured Capacity:</th><td>{Total|fmt_bytes}</td></tr>
 
-      <tr><th> DFS Used:</th><td>{Used|fmt_bytes}</td></tr>
 
-      <tr><th> Non DFS Used:</th><td>{NonDfsUsedSpace|fmt_bytes}</td></tr>
 
-      <tr><th> DFS Remaining:</th><td>{Free|fmt_bytes}</td></tr>
 
-      <tr><th> DFS Used%:</th><td>{PercentUsed|fmt_percentage}</td></tr>
 
-      <tr><th> DFS Remaining%:</th><td>{PercentRemaining|fmt_percentage}</td></tr>
 
-      <tr><th> Block Pool Used:</th><td>{BlockPoolUsedSpace|fmt_bytes}</td></tr>
 
-      <tr><th> Block Pool Used%:</th><td>{PercentBlockPoolUsed|fmt_percentage}</td></tr>
 
-      <tr><th> DataNodes usages% (Min/Median/Max/stdDev): </th>
 
+{#nn}
 
+<table class="table table-bordered table-striped">
 
+  <tr><th> Configured Capacity:</th><td>{Total|fmt_bytes}</td></tr>
 
+  <tr><th> DFS Used:</th><td>{Used|fmt_bytes}</td></tr>
 
+  <tr><th> Non DFS Used:</th><td>{NonDfsUsedSpace|fmt_bytes}</td></tr>
 
+  <tr><th> DFS Remaining:</th><td>{Free|fmt_bytes}</td></tr>
 
+  <tr><th> DFS Used%:</th><td>{PercentUsed|fmt_percentage}</td></tr>
 
+  <tr><th> DFS Remaining%:</th><td>{PercentRemaining|fmt_percentage}</td></tr>
 
+  <tr><th> Block Pool Used:</th><td>{BlockPoolUsedSpace|fmt_bytes}</td></tr>
 
+  <tr><th> Block Pool Used%:</th><td>{PercentBlockPoolUsed|fmt_percentage}</td></tr>
 
+  <tr><th> DataNodes usages% (Min/Median/Max/stdDev): </th>
 
 	<td>{#NodeUsage.nodeUsage}{min} / {median} / {max} / {stdDev}{/NodeUsage.nodeUsage}</td></tr>
 
 	<td>{#NodeUsage.nodeUsage}{min} / {median} / {max} / {stdDev}{/NodeUsage.nodeUsage}</td></tr>
 
-      {/nn}
 
+{/nn}
 
 
 
-      {#fs}
 
-      <tr><th><a href="#nodelist-operation">Live Nodes</a></th><td>{NumLiveDataNodes} (Decommissioned: {NumDecomLiveDataNodes})</td></tr>
 
-      <tr><th><a href="#nodelist-operation">Dead Nodes</a></th><td>{NumDeadDataNodes} (Decommissioned: {NumDecomDeadDataNodes})</td></tr>
 
-      <tr><th><a href="#nodelist-decom">Decommissioning Nodes</a></th><td>{NumDecommissioningDataNodes}</td></tr>
 
-      <tr><th title="Excludes missing blocks.">Number of Under-Replicated Blocks</th><td>{UnderReplicatedBlocks}</td></tr>
 
-      {/fs}
 
-    </table>
 
-  </div>
 
-</div>
 
+{#fs}
 
+  <tr><th><a href="#tab-datanode">Live Nodes</a></th><td>{NumLiveDataNodes} (Decommissioned: {NumDecomLiveDataNodes})</td></tr>
 
+  <tr><th><a href="#tab-datanode">Dead Nodes</a></th><td>{NumDeadDataNodes} (Decommissioned: {NumDecomDeadDataNodes})</td></tr>
 
+  <tr><th><a href="#tab-datanode">Decommissioning Nodes</a></th><td>{NumDecommissioningDataNodes}</td></tr>
 
+  <tr><th title="Excludes missing blocks.">Number of Under-Replicated Blocks</th><td>{UnderReplicatedBlocks}</td></tr>
 
+{/fs}
 
+</table>
 
 
 
-<hr/>
 
-<div class="panel panel-success">
 
-  <div class="panel-heading">NameNode Journal Status</div>
 
-  <div class="panel-body">
 
-    <p><b>Current transaction ID:</b> {nn.JournalTransactionInfo.LastAppliedOrWrittenTxId}</p>
 
-    <table class="table" title="NameNode Journals">
 
-      <thead>
 
+<div class="page-header"><h1>Namenode Journal Status</h1></div>
 
+<p><b>Current transaction ID:</b> {nn.JournalTransactionInfo.LastAppliedOrWrittenTxId}</p>
 
+<table class="table" title="NameNode Journals">
 
+  <thead>
 
 	<tr><th>Journal Manager</th><th>State</th></tr>
 
 	<tr><th>Journal Manager</th><th>State</th></tr>
 
-      </thead>
 
-      <tbody>
 
+  </thead>
 
+  <tbody>
 
 	{#nn.NameJournalStatus}
 
 	{#nn.NameJournalStatus}
 
 	<tr><td>{manager}</td><td>{stream}</td></tr>
 
 	<tr><td>{manager}</td><td>{stream}</td></tr>
 
 	{/nn.NameJournalStatus}
 
 	{/nn.NameJournalStatus}
 
-      </tbody>
 
-    </table>
 
-  </div>
 
-</div>
 
+  </tbody>
 
+</table>
 
 
 
-<hr/>
 
-<div class="panel panel-success">
 
-  <div class="panel-heading">NameNode Storage</div>
 
-  <div class="panel-body">
 
-    <table class="table" title="NameNode Storage">
 
-      <thead><tr><td><b>Storage Directory</b></td><td><b>Type</b></td><td><b>State</b></td></tr></thead>
 
-      {#nn.NameDirStatuses}
 
-      {#active}{#helper_dir_status type="Active"/}{/active}
 
-      {#failed}{#helper_dir_status type="Failed"/}{/failed}
 
-      {/nn.NameDirStatuses}
 
-    </table>
 
-  </div>
 
-</div>
 
-<hr/>
 
+<div class="page-header"><h1>NameNode Storage</h1></div>
 
+<table class="table" title="NameNode Storage">
 
+  <thead><tr><td><b>Storage Directory</b></td><td><b>Type</b></td><td><b>State</b></td></tr></thead>
 
+  {#nn.NameDirStatuses}
 
+  {#active}{#helper_dir_status type="Active"/}{/active}
 
+  {#failed}{#helper_dir_status type="Failed"/}{/failed}
 
+  {/nn.NameDirStatuses}
 
+</table>
 
+</script>
 
 
 
-<div class="panel panel-success">
 
-  <div class="panel-heading">Snapshot Summary</div>
 
-  <div class="panel-body">
 
-    {#fs.SnapshotStats}
 
-    <table class="table" title="Snapshot Summary">
 
-      <thead><tr><td><b>Snapshottable directories</b></td>
 
-	  <td><b>Snapshotted directories</b></td></tr>
 
-      </thead>
 
-      <tbody>
 
-	<tr>
 
-	  <td>{SnapshottableDirectories}</td>
 
-	  <td>{Snapshots}</td>
 
-	</tr>
 
-      </tbody>
 
-    </table>
 
-    {/fs.SnapshotStats}
 
-  </div>
 
-</div>
 
-<hr/>
 
+<script type="text/x-dust-template" id="tmpl-snapshot">
 
+<div class="page-header"><h1>Snapshot Summary</h1></div>
 
+<p><b>Snapshottable directories</b>: {SnapshottableDirectories}</p>
 
+<p><b>Snapshotted directories</b>: {Snapshots}</p>
 
+</script>
 
+
 
+<script type="text/x-dust-template" id="tmpl-datanode">
 
+<div class="page-header"><h1>Datanode Information</h1></div>
 
+<div class="page-header"><h1><small>In operation</small></h1></div>
 
+<small>
 
+<table class="table">
 
+  <thead>
 
+    <tr>
 
+      <th>Node</th>
 
+      <th>Last contact</th>
 
+      <th>Admin State</th>
 
+      <th>Capacity</th>
 
+      <th>Used</th>
 
+      <th>Non DFS Used</th>
 
+      <th>Remaining</th>
 
+      <th>Blocks</th>
 
+      <th>Block pool used</th>
 
+      <th>Failed Volumes</th>
 
+      <th>Version</th>
 
+    </tr>
 
+  </thead>
 
+  {#LiveNodes}
 
+  <tr>
 
+    <td>{name} ({xferaddr})</td>
 
+    <td>{lastContact}</td>
 
+    <td>{adminState}</td>
 
+    <td>{capacity|fmt_bytes}</td>
 
+    <td>{used|fmt_bytes}</td>
 
+    <td>{nonDfsUsedSpace|fmt_bytes}</td>
 
+    <td>{remaining|fmt_bytes}</td>
 
+    <td>{numBlocks}</td>
 
+    <td>{blockPoolUsed|fmt_bytes} ({blockPoolUsedPercent|fmt_percentage})</td>
 
+    <td>{volfails}</td>
 
+    <td>{version}</td>
 
+  </tr>
 
+  {/LiveNodes}
 
+  {#DeadNodes}
 
+  <tr class="danger">
 
+    <td>{name} ({xferaddr})</td>
 
+    <td>{lastContact}</td>
 
+    <td>Dead{?decomissioned}, Decomissioned{/decomissioned}</td>
 
+    <td>-</td>
 
+    <td>-</td>
 
+    <td>-</td>
 
+    <td>-</td>
 
+    <td>-</td>
 
+    <td>-</td>
 
+    <td>-</td>
 
+    <td>-</td>
 
+  </tr>
 
+  {/DeadNodes}
 
+</table>
 
+</small>
 
+
 
+<div class="page-header"><h1><small>Decomissioning</small></h1></div>
 
+<small>
 
+<table class="table">
 
+  <thead>
 
+    <tr>
 
+      <th>Node</th>
 
+      <th>Last contact</th>
 
+      <th>Under replicated blocks</th>
 
+      <th>Blocks with no live replicas</th>
 
+      <th>Under Replicated Blocks <br/>In files under construction</th>
 
+    </tr>
 
+  </thead>
 
+  {#DecomNodes}
 
+  <tr>
 
+    <td>{name} ({xferaddr})</td>
 
+    <td>{lastContact}</td>
 
+    <td>{underReplicatedBlocks}</td>
 
+    <td>{decommissionOnlyReplicas}</td>
 
+    <td>{underReplicateInOpenFiles}</td>
 
+  </tr>
 
+  {/DecomNodes}
 
+</table>
 
+</small>
 
+</script>
 
 
 
-{#startup}
 
-<div class="panel panel-success">
 
-  <div class="panel-heading">Startup Progress</div>
 
-  <div class="panel-body">
 
-    <p>Elapsed Time: {elapsedTime|fmt_time}, Percent Complete: {percentComplete|fmt_percentage}</p>
 
-    <table class="table">
 
-      <thead>
 
-	<tr>
 
+<script type="text/x-dust-template" id="tmpl-startup-progress">
 
+<div class="page-header"><h1>Startup Progress</h1></div>
 
+<p>Elapsed Time: {elapsedTime|fmt_time}, Percent Complete: {percentComplete|fmt_percentage}</p>
 
+<table class="table">
 
+  <thead>
 
+	<tr class="active">
 
 	  <th>Phase</th>
 
 	  <th>Phase</th>
 
-	  <th>Completion</th>
 
-	  <th>Elapsed Time</th>
 
+	  <th style="text-align:center">Completion</th>
 
+	  <th style="text-align:center">Elapsed Time</th>
 
 	</tr>
 
 	</tr>
 
-      </thead>
 
-      <tbody>
 
+  </thead>
 
+  <tbody>
 
 	{#phases}
 
 	{#phases}
 
 	<tr class="phase">
 
 	<tr class="phase">
 
 	  <td class="startupdesc">{desc} {file} {size|fmt_bytes}</td>
 
 	  <td class="startupdesc">{desc} {file} {size|fmt_bytes}</td>
 
-	  <td>{percentComplete|fmt_percentage}</td>
 
-	  <td>{elapsedTime|fmt_time}</td>
 
+	  <td style="text-align:center">{percentComplete|fmt_percentage}</td>
 
+	  <td style="text-align:center">{elapsedTime|fmt_time}</td>
 
 	</tr>
 
 	</tr>
 
 	{#steps root_file=file}
 
 	{#steps root_file=file}
 
 	<tr class="step">
 
 	<tr class="step">
 
 	  <td class="startupdesc">{stepDesc} {stepFile} {stepSize|fmt_bytes} ({count}/{total})</td>
 
 	  <td class="startupdesc">{stepDesc} {stepFile} {stepSize|fmt_bytes} ({count}/{total})</td>
 
-	  <td>{percentComplete|fmt_percentage}</td>
 
+	  <td style="text-align:center">{percentComplete|fmt_percentage}</td>
 
 	  <td></td>
 
 	  <td></td>
 
 	</tr>
 
 	</tr>
 
 	{/steps}
 
 	{/steps}
 
 	{/phases}
 
 	{/phases}
 
-    </table>
 
-  </div>
 
-</div>
 
-{/startup}
 
-
 
-<hr/>
 
-<div class="panel panel-success">
 
-  <div class="panel-heading">Datanode Information</div>
 
-  <div class="panel-body">
 
-    <div class="panel panel-default" id="nodelist-operation">
 
-      <div class="panel-heading">Nodes in operation</div>
 
-      <div class="panel-body">
 
-        <table class="table">
 
-          <thead>
 
-            <tr>
 
-              <th>Node</th>
 
-              <th>Last contact</th>
 
-              <th>Admin State</th>
 
-              <th>Capacity</th>
 
-              <th>Used</th>
 
-              <th>Non DFS Used</th>
 
-              <th>Remaining</th>
 
-              <th>Blocks</th>
 
-              <th>Block pool used</th>
 
-              <th>Failed Volumes</th>
 
-            </tr>
 
-          </thead>
 
-          {#nn.LiveNodes}
 
-          <tr>
 
-            <td>{name} ({xferaddr})</td>
 
-            <td>{lastContact}</td>
 
-            <td>{adminState}</td>
 
-            <td>{capacity|fmt_bytes}</td>
 
-            <td>{used|fmt_bytes}</td>
 
-            <td>{nonDfsUsedSpace|fmt_bytes}</td>
 
-            <td>{remaining|fmt_bytes}</td>
 
-            <td>{numBlocks}</td>
 
-            <td>{blockPoolUsed|fmt_bytes} ({blockPoolUsedPercent|fmt_percentage})</td>
 
-            <td>{volfails}</td>
 
-          </tr>
 
-          {/nn.LiveNodes}
 
-          {#nn.DeadNodes}
 
-          <tr class="danger">
 
-            <td>{name} ({xferaddr})</td>
 
-            <td>{lastContact}</td>
 
-            <td>Dead{?decomissioned}, Decomissioned{/decomissioned}</td>
 
-            <td>-</td>
 
-            <td>-</td>
 
-            <td>-</td>
 
-            <td>-</td>
 
-            <td>-</td>
 
-            <td>-</td>
 
-            <td>-</td>
 
-          </tr>
 
-          {/nn.DeadNodes}
 
-        </table>
 
-      </div>
 
-    </div>
 
-    <div class="panel panel-default" id="nodelist-decom">
 
-      <div class="panel-heading">Nodes being decomissioned</div>
 
-      <div class="panel-body">
 
-        <table class="table">
 
-          <thead>
 
-            <tr>
 
-              <th>Node</th>
 
-              <th>Last contact</th>
 
-              <th>Under replicated blocks</th>
 
-              <th>Blocks with no live replicas</th>
 
-              <th>Under Replicated Blocks <br/>In files under construction</th>
 
-            </tr>
 
-          </thead>
 
-          {#nn.DecomNodes}
 
-          <tr>
 
-            <td>{name} ({xferaddr})</td>
 
-            <td>{lastContact}</td>
 
-            <td>{underReplicatedBlocks}</td>
 
-            <td>{decommissionOnlyReplicas}</td>
 
-	    <td>{underReplicateInOpenFiles}</td>
 
-	  </tr>
 
-	  {/nn.DecomNodes}
 
-	</table>
 
-      </div>
 
-    </div>
 
-  </div>
 
-</div>
 
+  </tbody>
 
+</table>
 
 </script>
 
 </script>
 
 
 
 <script type="text/javascript" src="/static/jquery-1.10.2.min.js">
 
 <script type="text/javascript" src="/static/jquery-1.10.2.min.js">

+ 113 - 55
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
Näytä tiedosto 

@@ -18,10 +18,20 @@
 
 (function () {
 
 (function () {
 
   "use strict";
 
   "use strict";
 
 
 
-  var data = {};
 
+  dust.loadSource(dust.compile($('#tmpl-dfshealth').html(), 'dfshealth'));
 
+  dust.loadSource(dust.compile($('#tmpl-startup-progress').html(), 'startup-progress'));
 
+  dust.loadSource(dust.compile($('#tmpl-datanode').html(), 'datanode-info'));
 
+  dust.loadSource(dust.compile($('#tmpl-snapshot').html(), 'snapshot-info'));
 
 
 
-  function render() {
 
-    var helpers = {
 
+  function load_overview() {
 
+    var BEANS = [
 
+      {"name": "nn",      "url": "/jmx?qry=Hadoop:service=NameNode,name=NameNodeInfo"},
 
+      {"name": "nnstat",  "url": "/jmx?qry=Hadoop:service=NameNode,name=NameNodeStatus"},
 
+      {"name": "fs",      "url": "/jmx?qry=Hadoop:service=NameNode,name=FSNamesystemState"},
 
+      {"name": "mem",     "url": "/jmx?qry=java.lang:type=Memory"},
 
+    ];
 
+
 
+    var HELPERS = {
 
       'helper_fs_max_objects': function (chunk, ctx, bodies, params) {
 
       'helper_fs_max_objects': function (chunk, ctx, bodies, params) {
 
         var o = ctx.current();
 
         var o = ctx.current();
 
         if (o.MaxObjects > 0) {
 
         if (o.MaxObjects > 0) {
 
@@ -37,35 +47,53 @@
 
       }
 
       }
 
     };
 
     };
 
 
 
-    var base = dust.makeBase(helpers);
 
+    var data = {};
 
 
 
-    dust.loadSource(dust.compile($('#tmpl-dfshealth').html(), 'dfshealth'));
 
-    dust.render('dfshealth', base.push(data), function(err, out) {
 
-      $('#panel').html(out);
 
-    });
 
-  }
 
+    // Workarounds for the fact that JMXJsonServlet returns non-standard JSON strings
 
+    function data_workaround(d) {
 
+      d.nn.JournalTransactionInfo = JSON.parse(d.nn.JournalTransactionInfo);
 
+      d.nn.NameJournalStatus = JSON.parse(d.nn.NameJournalStatus);
 
+      d.nn.NameDirStatuses = JSON.parse(d.nn.NameDirStatuses);
 
+      d.nn.NodeUsage = JSON.parse(d.nn.NodeUsage);
 
+      d.nn.CorruptFiles = JSON.parse(d.nn.CorruptFiles);
 
+      return d;
 
+    }
 
 
 
-  var BEANS = [
 
-    {"name": "nn",      "url": "/jmx?qry=Hadoop:service=NameNode,name=NameNodeInfo"},
 
-    {"name": "nnstat",  "url": "/jmx?qry=Hadoop:service=NameNode,name=NameNodeStatus"},
 
-    {"name": "fs",      "url": "/jmx?qry=Hadoop:service=NameNode,name=FSNamesystemState"},
 
-    {"name": "mem",     "url": "/jmx?qry=java.lang:type=Memory"},
 
-    {"name": "startup", "url": "/startupProgress"}
 
-  ];
 
-
 
-  // Workarounds for the fact that JMXJsonServlet returns non-standard JSON strings
 
-  function data_workaround(d) {
 
-    function node_map_to_array(nodes) {
 
-      var res = [];
 
-      for (var n in nodes) {
 
-        var p = nodes[n];
 
-        p.name = n;
 
-        res.push(p);
 
-      }
 
-      return res;
 
+    load_json(
 
+      BEANS,
 
+      function(d) {
 
+        for (var k in d) {
 
+          data[k] = d[k].beans[0];
 
+        }
 
+        data = data_workaround(data);
 
+        render();
 
+      },
 
+      function (url, jqxhr, text, err) {
 
+        show_err_msg('<p>Failed to retrieve data from ' + url + ', cause: ' + err + '</p>');
 
+      });
 
+
 
+    function render() {
 
+      var base = dust.makeBase(HELPERS);
 
+      dust.render('dfshealth', base.push(data), function(err, out) {
 
+        $('#tab-overview').html(out);
 
+        $('a[href="#tab-datanode"]').click(load_datanode_info);
 
+        $('#ui-tabs a[href="#tab-overview"]').tab('show');
 
+      });
 
     }
 
     }
 
+  }
 
+  $('#ui-tabs a[href="#tab-overview"]').click(load_overview);
 
 
 
-    function startup_progress_workaround(r) {
 
+  function show_err_msg(msg) {
 
+    $('#alert-panel-body').html(msg);
 
+    $('#alert-panel').show();
 
+  }
 
+
 
+  function ajax_error_handler(url, jqxhr, text, err) {
 
+    show_err_msg('<p>Failed to retrieve data from ' + url + ', cause: ' + err + '</p>');
 
+  }
 
+
 
+  function load_startup_progress() {
 
+    function workaround(r) {
 
       function rename_property(o, s, d) {
 
       function rename_property(o, s, d) {
 
         if (o[s] !== undefined) {
 
         if (o[s] !== undefined) {
 
           o[d] = o[s];
 
           o[d] = o[s];
 
@@ -86,36 +114,66 @@
 
       });
 
       });
 
       return r;
 
       return r;
 
     }
 
     }
 
+    $.get('/startupProgress', function (resp) {
 
+      var data = workaround(resp);
 
+      dust.render('startup-progress', data, function(err, out) {
 
+        $('#tab-startup-progress').html(out);
 
+        $('#ui-tabs a[href="#tab-startup-progress"]').tab('show');
 
+      });
 
+    }).error(ajax_error_handler);
 
+  }
 
+
 
+  $('#ui-tabs a[href="#tab-startup-progress"]').click(load_startup_progress);
 
+
 
+  function load_datanode_info() {
 
+    function workaround(r) {
 
+      function node_map_to_array(nodes) {
 
+        var res = [];
 
+        for (var n in nodes) {
 
+          var p = nodes[n];
 
+          p.name = n;
 
+          res.push(p);
 
+        }
 
+        return res;
 
+      }
 
 
 
-    d.nn.JournalTransactionInfo = JSON.parse(d.nn.JournalTransactionInfo);
 
-    d.nn.NameJournalStatus = JSON.parse(d.nn.NameJournalStatus);
 
-    d.nn.NameDirStatuses = JSON.parse(d.nn.NameDirStatuses);
 
-    d.nn.NodeUsage = JSON.parse(d.nn.NodeUsage);
 
-    d.nn.LiveNodes = node_map_to_array(JSON.parse(d.nn.LiveNodes));
 
-    d.nn.DeadNodes = node_map_to_array(JSON.parse(d.nn.DeadNodes));
 
-    d.nn.DecomNodes = node_map_to_array(JSON.parse(d.nn.DecomNodes));
 
-    d.nn.CorruptFiles = JSON.parse(d.nn.CorruptFiles);
 
-
 
-    d.fs.SnapshotStats = JSON.parse(d.fs.SnapshotStats);
 
-    d.startup = startup_progress_workaround(d.startup);
 
-    return d;
 
+      r.LiveNodes = node_map_to_array(JSON.parse(r.LiveNodes));
 
+      r.DeadNodes = node_map_to_array(JSON.parse(r.DeadNodes));
 
+      r.DecomNodes = node_map_to_array(JSON.parse(r.DecomNodes));
 
+      return r;
 
+    }
 
+
 
+    $.get('/jmx?qry=Hadoop:service=NameNode,name=NameNodeInfo', function (resp) {
 
+      var data = workaround(resp.beans[0]);
 
+      dust.render('datanode-info', data, function(err, out) {
 
+        $('#tab-datanode').html(out);
 
+        $('#ui-tabs a[href="#tab-datanode"]').tab('show');
 
+      });
 
+    }).error(ajax_error_handler);
 
   }
 
   }
 
 
 
-  function show_err_msg(msg) {
 
-    $('#alert-panel-body').html(msg);
 
-    $('#alert-panel').show();
 
+  $('a[href="#tab-datanode"]').click(load_datanode_info);
 
+
 
+  function load_snapshot_info() {
 
+    $.get('/jmx?qry=Hadoop:service=NameNode,name=FSNamesystemState', function (resp) {
 
+      var data = JSON.parse(resp.beans[0].SnapshotStats);
 
+      dust.render('snapshot-info', data, function(err, out) {
 
+        $('#tab-snapshot').html(out);
 
+        $('#ui-tabs a[href="#tab-snapshot"]').tab('show');
 
+      });
 
+    }).error(ajax_error_handler);
 
   }
 
   }
 
 
 
-  load_json(
 
-    BEANS,
 
-    function(d) {
 
-      for (var k in d) {
 
-        data[k] = k === "startup" ? d[k] : d[k].beans[0];
 
-      }
 
-      data = data_workaround(data);
 
-      render();
 
-    },
 
-    function (url, jqxhr, text, err) {
 
-      show_err_msg('<p>Failed to retrieve data from ' + url + ', cause: ' + err + '</p>');
 
-    });
 
+  $('#ui-tabs a[href="#tab-snapshot"]').click(load_snapshot_info);
 
+
 
+  var hash = window.location.hash;
 
+  if (hash === "#tab-datanode") {
 
+    load_datanode_info();
 
+  } else if (hash === "#tab-snapshot") {
 
+    load_snapshot_info();
 
+  } else if (hash === "#tab-startup-progress") {
 
+    load_startup_progress();
 
+  } else {
 
+    load_overview();
 
+  }
 
 })();
 
 })();

+ 20 - 0
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/hadoop.css
Näytä tiedosto 

@@ -192,4 +192,24 @@ div.security {
 
 .panel-success > .panel-heading {
 
 .panel-success > .panel-heading {
 
   color: #fff !important;
 
   color: #fff !important;
 
   background-color: #5FA33E !important;
 
   background-color: #5FA33E !important;
 
+}
 
+
 
+header.bs-docs-nav, header.bs-docs-nav .navbar-brand {
 
+  border-radius: 0px;
 
+  background-color: #5fa33e;
 
+  color: #fff;
 
+}
 
+
 
+#ui-tabs > li > a {
 
+  color: #dcf0d3;
 
+}
 
+
 
+#ui-tabs .active a {
 
+  color: #fff;
 
+  background-color: #446633;
 
+}
 
+
 
+#alert-panel {
 
+  margin-top:20px;
 
+  display: none;
 
 }
 
 }