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 xy...@apache.org on 2017/07/13 00:00:45 UTC
hadoop git commit: HDFS-11502. Datanode UI should display hostname
based on JMX bean instead of window.location.hostname. Contributed by Jeffrey
E Rodriguez and Yuanbo Liu.
Repository: hadoop
Updated Branches:
refs/heads/trunk 9845bea59 -> e15e2713e
HDFS-11502. Datanode UI should display hostname based on JMX bean instead of window.location.hostname. Contributed by Jeffrey E Rodriguez and Yuanbo Liu.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e15e2713
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e15e2713
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e15e2713
Branch: refs/heads/trunk
Commit: e15e2713e1e344b14d63726639d1c83451921515
Parents: 9845bea
Author: Xiaoyu Yao <xy...@apache.org>
Authored: Wed Jul 12 16:26:09 2017 -0700
Committer: Xiaoyu Yao <xy...@apache.org>
Committed: Wed Jul 12 16:26:19 2017 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hdfs/server/datanode/DataNode.java | 8 ++++++++
.../apache/hadoop/hdfs/server/datanode/DataNodeMXBean.java | 7 +++++++
.../hadoop-hdfs/src/main/webapps/datanode/dn.js | 2 +-
.../hadoop/hdfs/server/datanode/TestDataNodeMXBean.java | 4 ++++
4 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e15e2713/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
index a95fdea..35fbb9c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
@@ -3063,6 +3063,14 @@ public class DataNode extends ReconfigurableBase
return JSON.toString(info);
}
+ /**
+ * Return hostname of the datanode.
+ */
+ @Override // DataNodeMXBean
+ public String getDatanodeHostname() {
+ return this.hostName;
+ }
+
/**
* Returned information is a JSON representation of an array,
* each element of the array is a map contains the information
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e15e2713/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNodeMXBean.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNodeMXBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNodeMXBean.java
index c86fe44..b5f0cd0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNodeMXBean.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNodeMXBean.java
@@ -75,6 +75,13 @@ public interface DataNodeMXBean {
public String getNamenodeAddresses();
/**
+ * Gets the datanode hostname.
+ *
+ * @return the datanode hostname for the datanode.
+ */
+ public String getDatanodeHostname();
+
+ /**
* Gets information of the block pool service actors.
*
* @return block pool service actors info
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e15e2713/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/dn.js
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/dn.js b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/dn.js
index ea963cc..9e2732c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/dn.js
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/dn.js
@@ -25,7 +25,7 @@
function load() {
$.get('/jmx?qry=Hadoop:service=DataNode,name=DataNodeInfo', function(resp) {
data.dn = workaround(resp.beans[0]);
- data.dn.HostName=window.location.hostname;
+ data.dn.HostName = resp.beans[0]['DatanodeHostname'];
render();
}).fail(show_err_msg);
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e15e2713/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMXBean.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMXBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMXBean.java
index faead18..9107aae 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMXBean.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMXBean.java
@@ -88,6 +88,10 @@ public class TestDataNodeMXBean {
String namenodeAddresses = (String)mbs.getAttribute(mxbeanName,
"NamenodeAddresses");
Assert.assertEquals(datanode.getNamenodeAddresses(),namenodeAddresses);
+ // get attribute "getDatanodeHostname"
+ String datanodeHostname = (String)mbs.getAttribute(mxbeanName,
+ "DatanodeHostname");
+ Assert.assertEquals(datanode.getDatanodeHostname(),datanodeHostname);
// get attribute "getVolumeInfo"
String volumeInfo = (String)mbs.getAttribute(mxbeanName, "VolumeInfo");
Assert.assertEquals(replaceDigits(datanode.getVolumeInfo()),
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org