You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sh...@apache.org on 2018/05/02 19:22:13 UTC

[38/50] [abbrv] hadoop git commit: HDFS-13499. RBF: Show disabled name services in the UI. Contributed by Inigo Goiri.

HDFS-13499. RBF: Show disabled name services in the UI. Contributed by Inigo Goiri.

(cherry picked from commit 0a293de00d5f123c7c8248459aa8ae88a45f39b1)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/87c9fff3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/87c9fff3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/87c9fff3

Branch: refs/heads/YARN-8200
Commit: 87c9fff3525945f431c36ec56d0b2710cd5627fc
Parents: 1c3d746
Author: Yiqun Lin <yq...@apache.org>
Authored: Fri Apr 27 10:38:15 2018 +0800
Committer: Yiqun Lin <yq...@apache.org>
Committed: Fri Apr 27 10:41:16 2018 +0800

----------------------------------------------------------------------
 .../src/main/webapps/router/federationhealth.html               | 1 +
 .../hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.js | 3 +++
 .../hadoop-hdfs-rbf/src/main/webapps/static/rbf.css             | 5 +++++
 3 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/87c9fff3/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html
index f1cf482..37fcb92 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html
@@ -132,6 +132,7 @@
     <li class="federationhealth-namenode-icon federationhealth-namenode-active">Active</li>
     <li class="federationhealth-namenode-icon federationhealth-namenode-standby">Standby</li>
     <li class="federationhealth-namenode-icon federationhealth-namenode-safemode">Safe mode</li>
+    <li class="federationhealth-namenode-icon federationhealth-namenode-disabled">Disabled</li>
     <li class="federationhealth-namenode-icon federationhealth-namenode-unavailable">Unavailable</li>
   </ul>
 </div>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/87c9fff3/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.js
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.js b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.js
index a0b0128..6779b61 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.js
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.js
@@ -130,6 +130,9 @@
           } else if (nodes[i].state === "UNAVAILABLE") {
             n.title = capitalise(n.state);
             n.iconState = "unavailable";
+          } else if (nodes[i].state === "DISABLED") {
+            n.title = capitalise(n.state);
+            n.iconState = "disabled";
           }
           if (n.namenodeId === "null") {
             n.namenodeId = "";

http://git-wip-us.apache.org/repos/asf/hadoop/blob/87c9fff3/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/static/rbf.css
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/static/rbf.css b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/static/rbf.css
index f923085..43112af 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/static/rbf.css
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/static/rbf.css
@@ -53,6 +53,11 @@
     content: "\e090";
 }
 
+.federationhealth-namenode-disabled:before {
+    color: #eea236;
+    content: "\e136";
+}
+
 .federationhealth-namenode-legend {
     list-style-type: none;
     text-align: right;


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org