From 47563d86fe6ba1a2de934c9ed740d0aafbf72d4e Mon Sep 17 00:00:00 2001
From: Lei Xu <lei@apache.org>
Date: Tue, 9 Jan 2018 11:53:49 -0800
Subject: [PATCH] HDFS-12994.
 TestReconstructStripedFile.testNNSendsErasureCodingTasks fails due to socket
 timeout. (Contributed by Lei (Eddy) Xu)

---
 .../org/apache/hadoop/hdfs/TestReconstructStripedFile.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 e3843a0954b..7201e114b38 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.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 void testProcessErasureCodingTasksSubmitionShouldSucceed()
   }
 
   // HDFS-12044
-  @Test(timeout = 60000)
+  @Test(timeout = 120000)
   public void testNNSendsErasureCodingTasks() throws Exception {
     testNNSendsErasureCodingTasks(1);
     testNNSendsErasureCodingTasks(2);
@@ -453,6 +454,9 @@ private void testNNSendsErasureCodingTasks(int deadDN) throws Exception {
     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();