HDFS-13199. RBF: Fix the hdfs router page missing label icon issue. Contributed by maobaolong.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d86f301d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d86f301d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d86f301d Branch: refs/heads/HDFS-7240 Commit: d86f301d464683f8d392dad50e83f50d823e862e Parents: 55c77bf Author: Inigo Goiri <inigo...@apache.org> Authored: Tue Feb 27 17:39:02 2018 -0800 Committer: Inigo Goiri <inigo...@apache.org> Committed: Tue Feb 27 17:39:02 2018 -0800 ---------------------------------------------------------------------- .../src/main/webapps/router/federationhealth.html | 6 +++--- .../src/main/webapps/router/federationhealth.js | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d86f301d/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/router/federationhealth.html ---------------------------------------------------------------------- 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 23d42d3..71e2132 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 & dead</li> + <li class="dfshealth-node-icon dfshealth-node-decommissioned">Decommissioned</li> + <li class="dfshealth-node-icon dfshealth-node-down-decommissioned">Decommissioned & dead</li> </ul> </div> <div class="page-header"><h1><small>In operation</small></h1></div> http://git-wip-us.apache.org/repos/asf/hadoop/blob/d86f301d/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/router/federationhealth.js ---------------------------------------------------------------------- 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 c054fde..b3ed868 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"; } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
