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 ma...@apache.org on 2018/01/04 15:37:50 UTC
hadoop git commit: HDFS-12913. TestDNFencingWithReplication sometimes
fails because of NameNode in standby state. Contributed by Zsolt Venczel.
Repository: hadoop
Updated Branches:
refs/heads/trunk 2a48b3594 -> 45a47198b
HDFS-12913. TestDNFencingWithReplication sometimes fails because of NameNode in standby state. Contributed by Zsolt Venczel.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/45a47198
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/45a47198
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/45a47198
Branch: refs/heads/trunk
Commit: 45a47198b43a96817679d5bf9e570d405555e3eb
Parents: 2a48b35
Author: Sean Mackrory <ma...@apache.org>
Authored: Thu Jan 4 08:22:01 2018 -0700
Committer: Sean Mackrory <ma...@apache.org>
Committed: Thu Jan 4 08:37:21 2018 -0700
----------------------------------------------------------------------
.../namenode/ha/TestDNFencingWithReplication.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/45a47198/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDNFencingWithReplication.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDNFencingWithReplication.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDNFencingWithReplication.java
index c91d4de..ee00da4 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDNFencingWithReplication.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDNFencingWithReplication.java
@@ -60,11 +60,14 @@ public class TestDNFencingWithReplication {
private static class ReplicationToggler extends RepeatingTestThread {
private final FileSystem fs;
private final Path path;
+ private final MiniDFSCluster cluster;
- public ReplicationToggler(TestContext ctx, FileSystem fs, Path p) {
+ ReplicationToggler(TestContext ctx, FileSystem fs, Path p,
+ MiniDFSCluster cluster) {
super(ctx);
this.fs = fs;
this.path = p;
+ this.cluster = cluster;
}
@Override
@@ -81,6 +84,7 @@ public class TestDNFencingWithReplication {
@Override
public Boolean get() {
try {
+ cluster.waitActive();
BlockLocation[] blocks = fs.getFileBlockLocations(path, 0, 10);
Assert.assertEquals(1, blocks.length);
return blocks[0].getHosts().length == replicas;
@@ -90,8 +94,8 @@ public class TestDNFencingWithReplication {
}
}, 100, 60000);
} catch (TimeoutException te) {
- throw new IOException("Timed out waiting for " + replicas + " replicas " +
- "on path " + path);
+ throw new IOException("Timed out waiting for " + replicas +
+ " replicas on path " + path);
}
}
@@ -122,7 +126,7 @@ public class TestDNFencingWithReplication {
for (int i = 0; i < NUM_THREADS; i++) {
Path p = new Path("/test-" + i);
DFSTestUtil.createFile(fs, p, BLOCK_SIZE*10, (short)3, (long)i);
- togglers.addThread(new ReplicationToggler(togglers, fs, p));
+ togglers.addThread(new ReplicationToggler(togglers, fs, p, cluster));
}
// Start a separate thread which will make sure that replication
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org