Repository: hadoop Updated Branches: refs/heads/branch-3.0 cf816bc75 -> 92f63d04a
HDFS-12994. TestReconstructStripedFile.testNNSendsErasureCodingTasks fails due to socket timeout. (Contributed by Lei (Eddy) Xu) (cherry picked from commit 47563d86fe6ba1a2de934c9ed740d0aafbf72d4e) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/92f63d04 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/92f63d04 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/92f63d04 Branch: refs/heads/branch-3.0 Commit: 92f63d04a1f3e5a85caa712f84a45143b0c9009b Parents: cf816bc Author: Lei Xu <l...@apache.org> Authored: Tue Jan 9 11:53:49 2018 -0800 Committer: Lei Xu <l...@apache.org> Committed: Tue Jan 9 12:26:30 2018 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/TestReconstructStripedFile.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/92f63d04/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReconstructStripedFile.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReconstructStripedFile.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReconstructStripedFile.java index e3843a0..7201e11 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReconstructStripedFile.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReconstructStripedFile.java @@ -37,6 +37,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys; import org.apache.hadoop.hdfs.protocol.DatanodeID; import org.apache.hadoop.hdfs.protocol.DatanodeInfo; import org.apache.hadoop.hdfs.protocol.ErasureCodingPolicy; @@ -438,7 +439,7 @@ public class TestReconstructStripedFile { } // HDFS-12044 - @Test(timeout = 60000) + @Test(timeout = 120000) public void testNNSendsErasureCodingTasks() throws Exception { testNNSendsErasureCodingTasks(1); testNNSendsErasureCodingTasks(2); @@ -453,6 +454,9 @@ public class TestReconstructStripedFile { conf.setInt(DFSConfigKeys.DFS_NAMENODE_REPLICATION_MAX_STREAMS_KEY, 20); conf.setInt(DFSConfigKeys.DFS_DN_EC_RECONSTRUCTION_THREADS_KEY, 2); + // Set shorter socket timeout, to allow the recovery task to be reschedule, + // if it is connecting to a dead DataNode. + conf.setInt(HdfsClientConfigKeys.DFS_CLIENT_SOCKET_TIMEOUT_KEY, 5 * 1000); cluster = new MiniDFSCluster.Builder(conf) .numDataNodes(numDataNodes).build(); cluster.waitActive(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
