[28/51] [abbrv] hadoop git commit: HDFS-10493. Add links to datanode web UI in namenode datanodes page. Contributed by Weiwei Yang.

2016-06-21 Thread subru
HDFS-10493. Add links to datanode web UI in namenode datanodes page. 
Contributed by Weiwei Yang.


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

Branch: refs/heads/YARN-2915
Commit: 280069510b71d81a150b2b28d9fa987891d82774
Parents: c35fa4a
Author: Kihwal Lee 
Authored: Fri Jun 17 11:05:44 2016 -0500
Committer: Kihwal Lee 
Committed: Fri Jun 17 11:05:44 2016 -0500

--
 .../hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html  |  9 +
 .../hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js| 10 ++
 2 files changed, 19 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/28006951/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
index 66c0dec..4fa2e4c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
@@ -300,6 +300,7 @@
   
 
   Node
+  Http Address
   Last contact
   Capacity
   Blocks
@@ -310,6 +311,13 @@
   {#LiveNodes}
   
 {name} ({xferaddr})
+
+{@select key=secureMode}
+  {@eq value="off"}{infoAddr}{/eq}
+  {@eq value="on"}{infoSecureAddr}{/eq}
+  {@default}{infoAddr}{/default}
+{/select}
+
 {lastContact}s
 
   
@@ -328,6 +336,7 @@
   {#DeadNodes}
   
 {name} ({xferaddr})
+
 {#helper_relative_time value="{lastContact}"/}
 
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/28006951/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
index e7245df..e2908c0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
@@ -210,6 +210,15 @@
 for (var i = 0, e = nodes.length; i < e; ++i) {
   var n = nodes[i];
   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") {
 n.state = "alive";
   } else if (nodes[i].adminState === "Decommission In Progress") {
@@ -249,6 +258,7 @@
 'lengthMenu': [ [25, 50, 100, -1], [25, 50, 100, "All"] ],
 'columns': [
   { 'orderDataType': 'ng-value', 'searchable': true },
+  { 'orderDataType': 'ng-value', 'searchable': true },
   { 'orderDataType': 'ng-value', 'type': 'numeric' },
   { 'orderDataType': 'ng-value', 'type': 'numeric' },
   { 'orderData': 3, 'type': 'numeric' },


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



[33/39] hadoop git commit: HDFS-10493. Add links to datanode web UI in namenode datanodes page. Contributed by Weiwei Yang.

2016-06-18 Thread aengineer
HDFS-10493. Add links to datanode web UI in namenode datanodes page. 
Contributed by Weiwei Yang.


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

Branch: refs/heads/HDFS-1312
Commit: 280069510b71d81a150b2b28d9fa987891d82774
Parents: c35fa4a
Author: Kihwal Lee 
Authored: Fri Jun 17 11:05:44 2016 -0500
Committer: Kihwal Lee 
Committed: Fri Jun 17 11:05:44 2016 -0500

--
 .../hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html  |  9 +
 .../hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js| 10 ++
 2 files changed, 19 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/28006951/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
index 66c0dec..4fa2e4c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
@@ -300,6 +300,7 @@
   
 
   Node
+  Http Address
   Last contact
   Capacity
   Blocks
@@ -310,6 +311,13 @@
   {#LiveNodes}
   
 {name} ({xferaddr})
+
+{@select key=secureMode}
+  {@eq value="off"}{infoAddr}{/eq}
+  {@eq value="on"}{infoSecureAddr}{/eq}
+  {@default}{infoAddr}{/default}
+{/select}
+
 {lastContact}s
 
   
@@ -328,6 +336,7 @@
   {#DeadNodes}
   
 {name} ({xferaddr})
+
 {#helper_relative_time value="{lastContact}"/}
 
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/28006951/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
index e7245df..e2908c0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
@@ -210,6 +210,15 @@
 for (var i = 0, e = nodes.length; i < e; ++i) {
   var n = nodes[i];
   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") {
 n.state = "alive";
   } else if (nodes[i].adminState === "Decommission In Progress") {
@@ -249,6 +258,7 @@
 'lengthMenu': [ [25, 50, 100, -1], [25, 50, 100, "All"] ],
 'columns': [
   { 'orderDataType': 'ng-value', 'searchable': true },
+  { 'orderDataType': 'ng-value', 'searchable': true },
   { 'orderDataType': 'ng-value', 'type': 'numeric' },
   { 'orderDataType': 'ng-value', 'type': 'numeric' },
   { 'orderData': 3, 'type': 'numeric' },


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



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

2016-06-17 Thread kihwal
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 242263c56 -> edd537309


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

(cherry picked from commit 280069510b71d81a150b2b28d9fa987891d82774)


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

Branch: refs/heads/branch-2.8
Commit: edd5373095bb5b063fe90c984dd62a15b1ee95ba
Parents: 242263c
Author: Kihwal Lee 
Authored: Fri Jun 17 11:13:12 2016 -0500
Committer: Kihwal Lee 
Committed: Fri Jun 17 11:13:12 2016 -0500

--
 .../hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html  |  9 +
 .../hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js| 10 ++
 2 files changed, 19 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/edd53730/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
index 66c0dec..4fa2e4c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
@@ -300,6 +300,7 @@
   
 
   Node
+  Http Address
   Last contact
   Capacity
   Blocks
@@ -310,6 +311,13 @@
   {#LiveNodes}
   
 {name} ({xferaddr})
+
+{@select key=secureMode}
+  {@eq value="off"}{infoAddr}{/eq}
+  {@eq value="on"}{infoSecureAddr}{/eq}
+  {@default}{infoAddr}{/default}
+{/select}
+
 {lastContact}s
 
   
@@ -328,6 +336,7 @@
   {#DeadNodes}
   
 {name} ({xferaddr})
+
 {#helper_relative_time value="{lastContact}"/}
 
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/edd53730/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
index e7245df..e2908c0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
@@ -210,6 +210,15 @@
 for (var i = 0, e = nodes.length; i < e; ++i) {
   var n = nodes[i];
   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") {
 n.state = "alive";
   } else if (nodes[i].adminState === "Decommission In Progress") {
@@ -249,6 +258,7 @@
 'lengthMenu': [ [25, 50, 100, -1], [25, 50, 100, "All"] ],
 'columns': [
   { 'orderDataType': 'ng-value', 'searchable': true },
+  { 'orderDataType': 'ng-value', 'searchable': true },
   { 'orderDataType': 'ng-value', 'type': 'numeric' },
   { 'orderDataType': 'ng-value', 'type': 'numeric' },
   { 'orderData': 3, 'type': 'numeric' },


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



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

2016-06-17 Thread kihwal
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 6afa044dd -> 35c6b725d


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

(cherry picked from commit 280069510b71d81a150b2b28d9fa987891d82774)


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

Branch: refs/heads/branch-2
Commit: 35c6b725dbadb25c6ce9fb6672af26b69cb16f52
Parents: 6afa044
Author: Kihwal Lee 
Authored: Fri Jun 17 11:12:16 2016 -0500
Committer: Kihwal Lee 
Committed: Fri Jun 17 11:12:16 2016 -0500

--
 .../hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html  |  9 +
 .../hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js| 10 ++
 2 files changed, 19 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/35c6b725/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
index 66c0dec..4fa2e4c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
@@ -300,6 +300,7 @@
   
 
   Node
+  Http Address
   Last contact
   Capacity
   Blocks
@@ -310,6 +311,13 @@
   {#LiveNodes}
   
 {name} ({xferaddr})
+
+{@select key=secureMode}
+  {@eq value="off"}{infoAddr}{/eq}
+  {@eq value="on"}{infoSecureAddr}{/eq}
+  {@default}{infoAddr}{/default}
+{/select}
+
 {lastContact}s
 
   
@@ -328,6 +336,7 @@
   {#DeadNodes}
   
 {name} ({xferaddr})
+
 {#helper_relative_time value="{lastContact}"/}
 
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/35c6b725/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
index e7245df..e2908c0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
@@ -210,6 +210,15 @@
 for (var i = 0, e = nodes.length; i < e; ++i) {
   var n = nodes[i];
   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") {
 n.state = "alive";
   } else if (nodes[i].adminState === "Decommission In Progress") {
@@ -249,6 +258,7 @@
 'lengthMenu': [ [25, 50, 100, -1], [25, 50, 100, "All"] ],
 'columns': [
   { 'orderDataType': 'ng-value', 'searchable': true },
+  { 'orderDataType': 'ng-value', 'searchable': true },
   { 'orderDataType': 'ng-value', 'type': 'numeric' },
   { 'orderDataType': 'ng-value', 'type': 'numeric' },
   { 'orderData': 3, 'type': 'numeric' },


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



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

2016-06-17 Thread kihwal
Repository: hadoop
Updated Branches:
  refs/heads/trunk c35fa4a0e -> 280069510


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


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

Branch: refs/heads/trunk
Commit: 280069510b71d81a150b2b28d9fa987891d82774
Parents: c35fa4a
Author: Kihwal Lee 
Authored: Fri Jun 17 11:05:44 2016 -0500
Committer: Kihwal Lee 
Committed: Fri Jun 17 11:05:44 2016 -0500

--
 .../hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html  |  9 +
 .../hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js| 10 ++
 2 files changed, 19 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/28006951/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
index 66c0dec..4fa2e4c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
@@ -300,6 +300,7 @@
   
 
   Node
+  Http Address
   Last contact
   Capacity
   Blocks
@@ -310,6 +311,13 @@
   {#LiveNodes}
   
 {name} ({xferaddr})
+
+{@select key=secureMode}
+  {@eq value="off"}{infoAddr}{/eq}
+  {@eq value="on"}{infoSecureAddr}{/eq}
+  {@default}{infoAddr}{/default}
+{/select}
+
 {lastContact}s
 
   
@@ -328,6 +336,7 @@
   {#DeadNodes}
   
 {name} ({xferaddr})
+
 {#helper_relative_time value="{lastContact}"/}
 
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/28006951/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
index e7245df..e2908c0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
@@ -210,6 +210,15 @@
 for (var i = 0, e = nodes.length; i < e; ++i) {
   var n = nodes[i];
   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") {
 n.state = "alive";
   } else if (nodes[i].adminState === "Decommission In Progress") {
@@ -249,6 +258,7 @@
 'lengthMenu': [ [25, 50, 100, -1], [25, 50, 100, "All"] ],
 'columns': [
   { 'orderDataType': 'ng-value', 'searchable': true },
+  { 'orderDataType': 'ng-value', 'searchable': true },
   { 'orderDataType': 'ng-value', 'type': 'numeric' },
   { 'orderDataType': 'ng-value', 'type': 'numeric' },
   { 'orderData': 3, 'type': 'numeric' },


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