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 ki...@apache.org on 2020/01/10 18:51:46 UTC
[hadoop] branch branch-3.1 updated: HDFS-15095. Fix
TestDecommissioningStatus. Contributed by Ahmed Hussein.
This is an automated email from the ASF dual-hosted git repository.
kihwal pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 82fa8d8 HDFS-15095. Fix TestDecommissioningStatus. Contributed by Ahmed Hussein.
82fa8d8 is described below
commit 82fa8d88ef1f5b8daf08ae80c6e47e2151882a76
Author: Kihwal Lee <ki...@apache.org>
AuthorDate: Fri Jan 10 12:47:49 2020 -0600
HDFS-15095. Fix TestDecommissioningStatus. Contributed by Ahmed Hussein.
(cherry picked from commit 5fb901ac4017b4f13b089ecd920e864cd53ad3a6)
---
.../server/namenode/TestDecommissioningStatus.java | 31 ++++++++++++++++++++--
1 file changed, 29 insertions(+), 2 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDecommissioningStatus.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDecommissioningStatus.java
index cfebff7..d9d1f47 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDecommissioningStatus.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDecommissioningStatus.java
@@ -27,6 +27,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.concurrent.TimeoutException;
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.BlockLocation;
@@ -55,6 +56,7 @@ import org.apache.hadoop.hdfs.server.datanode.DataNode;
import org.apache.hadoop.hdfs.server.datanode.DataNodeTestUtils;
import org.apache.hadoop.hdfs.tools.DFSAdmin;
import org.apache.hadoop.hdfs.util.HostsFileWriter;
+import org.apache.hadoop.test.GenericTestUtils;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.After;
@@ -199,6 +201,23 @@ public class TestDecommissioningStatus {
}
/**
+ * Allows the main thread to block until the decommission is checked by the
+ * admin manager.
+ * @param dnAdminMgr admin instance in the datanode manager.
+ * @param trackedNumber number of nodes expected to be DECOMMISSIONED or
+ * IN_MAINTENANCE.
+ * @throws TimeoutException
+ * @throws InterruptedException
+ */
+ private void waitForDecommissionedNodes(final DatanodeAdminManager dnAdminMgr,
+ final int trackedNumber)
+ throws TimeoutException, InterruptedException {
+ GenericTestUtils
+ .waitFor(() -> dnAdminMgr.getNumTrackedNodes() == trackedNumber,
+ 100, 2000);
+ }
+
+ /**
* Tests Decommissioning Status in DFS.
*/
@Test
@@ -233,6 +252,8 @@ public class TestDecommissioningStatus {
dm.refreshNodes(conf);
decommissionedNodes.add(downnode);
BlockManagerTestUtil.recheckDecommissionState(dm);
+ // Block until the admin's monitor updates the number of tracked nodes.
+ waitForDecommissionedNodes(dm.getDatanodeAdminManager(), iteration + 1);
final List<DatanodeDescriptor> decommissioningNodes = dm.getDecommissioningNodes();
if (iteration == 0) {
assertEquals(decommissioningNodes.size(), 1);
@@ -309,11 +330,11 @@ public class TestDecommissioningStatus {
// Force DatanodeManager to check decommission state.
BlockManagerTestUtil.recheckDecommissionState(dm);
-
+ // Block until the admin's monitor updates the number of tracked nodes.
+ waitForDecommissionedNodes(dm.getDatanodeAdminManager(), 1);
// Verify that the DN remains in DECOMMISSION_INPROGRESS state.
assertTrue("the node should be DECOMMISSION_IN_PROGRESSS",
dead.get(0).isDecommissionInProgress());
-
// Check DatanodeManager#getDecommissionNodes, make sure it returns
// the node as decommissioning, even if it's dead
List<DatanodeDescriptor> decomlist = dm.getDecommissioningNodes();
@@ -323,6 +344,8 @@ public class TestDecommissioningStatus {
// DECOMMISSION_IN_PROGRESS node become DECOMMISSIONED
AdminStatesBaseTest.cleanupFile(fileSys, f);
BlockManagerTestUtil.recheckDecommissionState(dm);
+ // Block until the admin's monitor updates the number of tracked nodes.
+ waitForDecommissionedNodes(dm.getDatanodeAdminManager(), 0);
assertTrue("the node should be decommissioned",
dead.get(0).isDecommissioned());
@@ -357,6 +380,8 @@ public class TestDecommissioningStatus {
decommissionNode(dnName);
dm.refreshNodes(conf);
BlockManagerTestUtil.recheckDecommissionState(dm);
+ // Block until the admin's monitor updates the number of tracked nodes.
+ waitForDecommissionedNodes(dm.getDatanodeAdminManager(), 0);
assertTrue(dnDescriptor.isDecommissioned());
// Add the node back
@@ -405,6 +430,8 @@ public class TestDecommissioningStatus {
hostsFileWriter.initExcludeHosts(nodes);
dm.refreshNodes(conf);
BlockManagerTestUtil.recheckDecommissionState(dm);
+ // Block until the admin's monitor updates the number of tracked nodes.
+ waitForDecommissionedNodes(dm.getDatanodeAdminManager(), 0);
assertTrue(dnDescriptor0.isDecommissioned());
assertTrue(dnDescriptor1.isDecommissioned());
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org