Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-10493. Add links to datanode web UI in namenode datanodes page. Contributed by Weiwei Yang. 

(cherry picked from commit 280069510b)
This commit is contained in:
Kihwal Lee 2016-06-17 11:13:12 -05:00
parent 242263c56d
commit edd5373095
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
View File

@ -300,6 +300,7 @@
<thead> <thead>
<tr> <tr>
<th>Node</th> <th>Node</th>
<th>Http Address</th>
<th>Last contact</th> <th>Last contact</th>
<th style="width:180px; text-align:center">Capacity</th> <th style="width:180px; text-align:center">Capacity</th>
<th>Blocks</th> <th>Blocks</th>
@ -310,6 +311,13 @@
{#LiveNodes} {#LiveNodes}
<tr> <tr>
<td ng-value="{state}-{name}" class="dfshealth-node-icon dfshealth-node-{state}">{name} ({xferaddr})</td> <td ng-value="{state}-{name}" class="dfshealth-node-icon dfshealth-node-{state}">{name} ({xferaddr})</td>
<td ng-value="{state}-{name}">
{@select key=secureMode}
{@eq value="off"}<a href='//{infoAddr}'>{infoAddr}</a>{/eq}
{@eq value="on"}<a href='//{infoSecureAddr}'>{infoSecureAddr}</a>{/eq}
{@default}<a href='//{infoAddr}'>{infoAddr}</a>{/default}
{/select}
</td>
<td ng-value="{lastContact}">{lastContact}s</td> <td ng-value="{lastContact}">{lastContact}s</td>
<td ng-value="{usedPercentage}"> <td ng-value="{usedPercentage}">
<div> <div>
@ -328,6 +336,7 @@
{#DeadNodes} {#DeadNodes}
<tr class="danger"> <tr class="danger">
<td ng-value="{state}-{name}" class="dfshealth-node-icon dfshealth-node-{state}">{name} ({xferaddr})</td> <td ng-value="{state}-{name}" class="dfshealth-node-icon dfshealth-node-{state}">{name} ({xferaddr})</td>
<td></td>
<td>{#helper_relative_time value="{lastContact}"/}</td> <td>{#helper_relative_time value="{lastContact}"/}</td>
<td></td> <td></td>
<td></td> <td></td>

10
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
View File

@ -210,6 +210,15 @@
for (var i = 0, e = nodes.length; i < e; ++i) { for (var i = 0, e = nodes.length; i < e; ++i) {
var n = nodes[i]; var n = nodes[i];
n.usedPercentage = Math.round((n.used + n.nonDfsUsedSpace) * 1.0 / n.capacity * 100); n.usedPercentage = Math.round((n.used + n.nonDfsUsedSpace) * 1.0 / n.capacity * 100);
var addr = n.infoSecureAddr;
var position = addr.lastIndexOf(":");
var port = addr.substring(position + 1, addr.length);
n.secureMode = "off";
if (port != 0) {
n.secureMode = "on";
}
if (n.adminState === "In Service") { if (n.adminState === "In Service") {
n.state = "alive"; n.state = "alive";
} else if (nodes[i].adminState === "Decommission In Progress") { } else if (nodes[i].adminState === "Decommission In Progress") {
@ -248,6 +257,7 @@
$('#table-datanodes').dataTable( { $('#table-datanodes').dataTable( {
'lengthMenu': [ [25, 50, 100, -1], [25, 50, 100, "All"] ], 'lengthMenu': [ [25, 50, 100, -1], [25, 50, 100, "All"] ],
'columns': [ 'columns': [
{ 'orderDataType': 'ng-value', 'searchable': true },
{ 'orderDataType': 'ng-value', 'searchable': true }, { 'orderDataType': 'ng-value', 'searchable': true },
{ 'orderDataType': 'ng-value', 'type': 'numeric' }, { 'orderDataType': 'ng-value', 'type': 'numeric' },
{ 'orderDataType': 'ng-value', 'type': 'numeric' }, { 'orderDataType': 'ng-value', 'type': 'numeric' },