From 0eff245d3d2bc1dea0110404dad82b53588194b9 Mon Sep 17 00:00:00 2001
From: Inigo Goiri <inigoiri@apache.org>
Date: Tue, 27 Feb 2018 17:39:02 -0800
Subject: [PATCH] HDFS-13199. RBF: Fix the hdfs router page missing label icon
 issue. Contributed by maobaolong.

(cherry picked from commit d86f301d464683f8d392dad50e83f50d823e862e)
---
 .../src/main/webapps/router/federationhealth.html      |  6 +++---
 .../src/main/webapps/router/federationhealth.js        | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/router/federationhealth.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/router/federationhealth.html
index 526c092bed8..a49008689c0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/router/federationhealth.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/router/federationhealth.html
@@ -253,7 +253,7 @@
 <div>
   <ul class="dfshealth-node-legend">
     <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>
   </ul>
 </div>
@@ -297,8 +297,8 @@
   <ul class="dfshealth-node-legend">
     <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-decommisioned">Decommisioned</li>
-    <li class="dfshealth-node-icon dfshealth-node-down-decommisioned">Decommissioned &amp; dead</li>
+    <li class="dfshealth-node-icon dfshealth-node-decommissioned">Decommissioned</li>
+    <li class="dfshealth-node-icon dfshealth-node-down-decommissioned">Decommissioned &amp; dead</li>
   </ul>
 </div>
 <div class="page-header"><h1><small>In operation</small></h1></div>
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/router/federationhealth.js b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/router/federationhealth.js
index c054fde7c11..b3ed868c664 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/router/federationhealth.js
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/router/federationhealth.js
@@ -117,13 +117,13 @@
           n.iconState = "down";
           if (n.isSafeMode === true) {
             n.title = capitalise(n.state) + " (safe mode)"
-            n.iconState = "decommisioned";
+            n.iconState = "decommissioned";
           } else if (n.state === "ACTIVE") {
             n.title = capitalise(n.state);
             n.iconState = "alive";
           } else if (nodes[i].state === "STANDBY") {
             n.title = capitalise(n.state);
-            n.iconState = "down-decommisioned";
+            n.iconState = "down-decommissioned";
           } else if (nodes[i].state === "UNAVAILABLE") {
             n.title = capitalise(n.state);
             n.iconState = "down";
@@ -189,10 +189,10 @@
             n.iconState = "alive";
           } else if (n.status === "SAFEMODE") {
             n.title = capitalise(n.status);
-            n.iconState = "down-decommisioned";
+            n.iconState = "down-decommissioned";
           } else if (n.status === "STOPPING") {
             n.title = capitalise(n.status);
-            n.iconState = "decommisioned";
+            n.iconState = "decommissioned";
           } else if (n.status === "SHUTDOWN") {
             n.title = capitalise(n.status);
             n.iconState = "down";
@@ -258,7 +258,7 @@
           if (n.adminState === "In Service") {
             n.state = "alive";
           } else if (nodes[i].adminState === "Decommission In Progress") {
-            n.state = "decommisioning";
+            n.state = "decommissioning";
           } else if (nodes[i].adminState === "Decommissioned") {
             n.state = "decommissioned";
           }