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 he...@apache.org on 2020/08/24 13:28:30 UTC
[hadoop] branch trunk updated: HDFS-15448. Remove duplicate
BlockPoolManager starting when run DataNode. Contriubted by jianghua zhu.
This is an automated email from the ASF dual-hosted git repository.
hexiaoqiao pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new a783042 HDFS-15448. Remove duplicate BlockPoolManager starting when run DataNode. Contriubted by jianghua zhu.
a783042 is described below
commit a7830423c578d2909112f90aedf3d9aefeabc9c2
Author: He Xiaoqiao <he...@apache.org>
AuthorDate: Mon Aug 24 21:13:47 2020 +0800
HDFS-15448. Remove duplicate BlockPoolManager starting when run DataNode. Contriubted by jianghua zhu.
---
.../java/org/apache/hadoop/hdfs/server/datanode/DataNode.java | 6 +++++-
.../apache/hadoop/hdfs/server/datanode/TestDataNodeExit.java | 11 +++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
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 7f740c3..36ec1f4 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
@@ -2710,7 +2710,11 @@ public class DataNode extends ReconfigurableBase
* If this thread is specifically interrupted, it will stop waiting.
*/
public void runDatanodeDaemon() throws IOException {
- blockPoolManager.startAll();
+
+ // Verify that blockPoolManager has been started.
+ if (!isDatanodeUp()) {
+ throw new IOException("Failed to instantiate DataNode.");
+ }
// start dataXceiveServer
dataXceiverServer.start();
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeExit.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeExit.java
index 918ad83..8c2fe37 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeExit.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeExit.java
@@ -82,6 +82,17 @@ public class TestDataNodeExit {
dn.getBpOsCount());
}
+ @Test
+ public void testBPServiceState() {
+ List<DataNode> dataNodes = cluster.getDataNodes();
+ for (DataNode dataNode : dataNodes) {
+ List<BPOfferService> bposList = dataNode.getAllBpOs();
+ for (BPOfferService bpOfferService : bposList) {
+ assertTrue(bpOfferService.isAlive());
+ }
+ }
+ }
+
/**
* Test BPService Thread Exit
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org