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

HDFS-13199. RBF: Fix the hdfs router page missing label icon issue. Contributed by maobaolong. 

(cherry picked from commit d86f301d46)
This commit is contained in:
Inigo Goiri 2018-02-27 17:39:02 -08:00
parent 13e86a7ab8
commit 0d7a3f48bc
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/router/federationhealth.html
View File

@ -253,7 +253,7 @@
<div> <div>
<ul class="dfshealth-node-legend"> <ul class="dfshealth-node-legend">
<li class="dfshealth-node-icon dfshealth-node-alive">Active</li> <li class="dfshealth-node-icon dfshealth-node-alive">Active</li>
<li class="dfshealth-node-icon dfshealth-node-decommisioned">Safe mode</li> <li class="dfshealth-node-icon dfshealth-node-decommissioned">Safe mode</li>
<li class="dfshealth-node-icon dfshealth-node-down">Unavailable</li> <li class="dfshealth-node-icon dfshealth-node-down">Unavailable</li>
</ul> </ul>
</div> </div>
@ -297,8 +297,8 @@
<ul class="dfshealth-node-legend"> <ul class="dfshealth-node-legend">
<li class="dfshealth-node-icon dfshealth-node-alive">In service</li> <li class="dfshealth-node-icon dfshealth-node-alive">In service</li>
<li class="dfshealth-node-icon dfshealth-node-down">Down</li> <li class="dfshealth-node-icon dfshealth-node-down">Down</li>
<li class="dfshealth-node-icon dfshealth-node-decommisioned">Decommisioned</li> <li class="dfshealth-node-icon dfshealth-node-decommissioned">Decommissioned</li>
<li class="dfshealth-node-icon dfshealth-node-down-decommisioned">Decommissioned &amp; dead</li> <li class="dfshealth-node-icon dfshealth-node-down-decommissioned">Decommissioned &amp; dead</li>
</ul> </ul>
</div> </div>
<div class="page-header"><h1><small>In operation</small></h1></div> <div class="page-header"><h1><small>In operation</small></h1></div>

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

@ -117,13 +117,13 @@
n.iconState = "down"; n.iconState = "down";
if (n.isSafeMode === true) { if (n.isSafeMode === true) {
n.title = capitalise(n.state) + " (safe mode)" n.title = capitalise(n.state) + " (safe mode)"
n.iconState = "decommisioned"; n.iconState = "decommissioned";
} else if (n.state === "ACTIVE") { } else if (n.state === "ACTIVE") {
n.title = capitalise(n.state); n.title = capitalise(n.state);
n.iconState = "alive"; n.iconState = "alive";
} else if (nodes[i].state === "STANDBY") { } else if (nodes[i].state === "STANDBY") {
n.title = capitalise(n.state); n.title = capitalise(n.state);
n.iconState = "down-decommisioned"; n.iconState = "down-decommissioned";
} else if (nodes[i].state === "UNAVAILABLE") { } else if (nodes[i].state === "UNAVAILABLE") {
n.title = capitalise(n.state); n.title = capitalise(n.state);
n.iconState = "down"; n.iconState = "down";
@ -189,10 +189,10 @@
n.iconState = "alive"; n.iconState = "alive";
} else if (n.status === "SAFEMODE") { } else if (n.status === "SAFEMODE") {
n.title = capitalise(n.status); n.title = capitalise(n.status);
n.iconState = "down-decommisioned"; n.iconState = "down-decommissioned";
} else if (n.status === "STOPPING") { } else if (n.status === "STOPPING") {
n.title = capitalise(n.status); n.title = capitalise(n.status);
n.iconState = "decommisioned"; n.iconState = "decommissioned";
} else if (n.status === "SHUTDOWN") { } else if (n.status === "SHUTDOWN") {
n.title = capitalise(n.status); n.title = capitalise(n.status);
n.iconState = "down"; n.iconState = "down";
@ -258,7 +258,7 @@
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") {
n.state = "decommisioning"; n.state = "decommissioning";
} else if (nodes[i].adminState === "Decommissioned") { } else if (nodes[i].adminState === "Decommissioned") {
n.state = "decommissioned"; n.state = "decommissioned";
} }