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 in...@apache.org on 2018/09/21 22:33:58 UTC
hadoop git commit: HDFS-13927. Improve
TestDataNodeMultipleRegistrations#testDNWithInvalidStorageWithHA wait.
Contributed by Ayush Saxena.
Repository: hadoop
Updated Branches:
refs/heads/trunk 0cd634610 -> 4758b4b6d
HDFS-13927. Improve TestDataNodeMultipleRegistrations#testDNWithInvalidStorageWithHA wait. Contributed by Ayush Saxena.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4758b4b6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4758b4b6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4758b4b6
Branch: refs/heads/trunk
Commit: 4758b4b6dabb315566fc3819ed1798f3606c31f4
Parents: 0cd6346
Author: Inigo Goiri <in...@apache.org>
Authored: Fri Sep 21 15:32:28 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Fri Sep 21 15:32:28 2018 -0700
----------------------------------------------------------------------
.../TestDataNodeMultipleRegistrations.java | 26 ++++++++++++++------
1 file changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4758b4b6/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMultipleRegistrations.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMultipleRegistrations.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMultipleRegistrations.java
index bd28fde..b2e3142 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMultipleRegistrations.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMultipleRegistrations.java
@@ -19,7 +19,6 @@
package org.apache.hadoop.hdfs.server.datanode;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertTrue;
@@ -31,6 +30,7 @@ import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.base.Supplier;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.DFSTestUtil;
import org.apache.hadoop.hdfs.HdfsConfiguration;
@@ -38,9 +38,11 @@ import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.hdfs.MiniDFSCluster.DataNodeProperties;
import org.apache.hadoop.hdfs.MiniDFSNNTopology;
import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.StartupOption;
+import org.apache.hadoop.hdfs.server.datanode.BPServiceActor.RunningState;
import org.apache.hadoop.hdfs.server.namenode.FSImageTestUtil;
import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
import org.apache.hadoop.hdfs.server.namenode.NameNode;
+import org.apache.hadoop.test.GenericTestUtils;
import org.apache.hadoop.util.StringUtils;
import org.junit.Assert;
import org.junit.Before;
@@ -293,12 +295,22 @@ public class TestDataNodeMultipleRegistrations {
cluster.restartNameNode(0, false);
cluster.restartNameNode(1, false);
cluster.restartDataNode(dnProp);
-
- // let the initialization be complete
- Thread.sleep(10000);
- dn = cluster.getDataNodes().get(0);
- assertFalse("Datanode should have shutdown as only service failed",
- dn.isDatanodeUp());
+ final DataNode restartedDn = cluster.getDataNodes().get(0);
+
+ // Wait till datanode confirms FAILED running state.
+ GenericTestUtils.waitFor(new Supplier<Boolean>() {
+ @Override
+ public Boolean get() {
+ for (BPOfferService bp : restartedDn.getAllBpOs()) {
+ for (BPServiceActor ba : bp.getBPServiceActors()) {
+ if (!ba.getRunningState().equals(RunningState.FAILED.name())) {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+ }, 500, 10000);
} finally {
cluster.shutdown();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org