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/01/19 00:54:10 UTC
hadoop git commit: HDFS-11003. Expose XmitsInProgress through
DataNodeMXBean. Contributed By Brahma Reddy Battula
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 e029556d6 -> 314f09d17
HDFS-11003. Expose XmitsInProgress through DataNodeMXBean. Contributed By Brahma Reddy Battula
(cherry picked from commit 5f4ae85bd8a20510948696467873498723b06477)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/314f09d1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/314f09d1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/314f09d1
Branch: refs/heads/branch-2.7
Commit: 314f09d17ed4ec722c52fa33feec08a6c2abe69b
Parents: e029556
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Sat Oct 15 22:28:33 2016 +0530
Committer: Konstantin V Shvachko <sh...@apache.org>
Committed: Thu Jan 18 16:53:26 2018 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/hdfs/server/datanode/DataNode.java | 5 +++--
.../org/apache/hadoop/hdfs/server/datanode/DataNodeMXBean.java | 6 ++++++
.../apache/hadoop/hdfs/server/datanode/TestDataNodeMXBean.java | 5 +++++
4 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/314f09d1/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 450ede9..59d6d4b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -8,6 +8,9 @@ Release 2.7.6 - UNRELEASED
IMPROVEMENTS
+ HDFS-11003. Expose XmitsInProgress through DataNodeMXBean.
+ (Brahma Reddy Battula)
+
OPTIMIZATIONS
BUG FIXES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/314f09d1/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 5f89aae..5c17e7a 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
@@ -1882,8 +1882,9 @@ public class DataNode extends ReconfigurableBase
}
}
}
-
- int getXmitsInProgress() {
+
+ @Override //DataNodeMXBean
+ public int getXmitsInProgress() {
return xmitsInProgress.get();
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/314f09d1/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 92abd88..eb7bd6e 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
@@ -80,6 +80,12 @@ public interface DataNodeMXBean {
public int getXceiverCount();
/**
+ * Returns an estimate of the number of data replication/reconstruction tasks
+ * running currently.
+ */
+ public int getXmitsInProgress();
+
+ /**
* Gets the network error counts on a per-Datanode basis.
*/
public Map<String, Map<String, Long>> getDatanodeNetworkCounts();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/314f09d1/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 b461e3a..250bbd3 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
@@ -70,6 +70,11 @@ public class TestDataNodeMXBean {
int xceiverCount = (Integer)mbs.getAttribute(mxbeanName,
"XceiverCount");
Assert.assertEquals(datanode.getXceiverCount(), xceiverCount);
+ // Ensure mxbean's XmitsInProgress is same as the DataNode's
+ // live value.
+ int xmitsInProgress =
+ (Integer) mbs.getAttribute(mxbeanName, "XmitsInProgress");
+ Assert.assertEquals(datanode.getXmitsInProgress(), xmitsInProgress);
} finally {
if (cluster != null) {cluster.shutdown();}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org