|
@@ -37,6 +37,7 @@ import org.apache.commons.logging.Log;
|
|
import org.apache.commons.logging.LogFactory;
|
|
import org.apache.commons.logging.LogFactory;
|
|
import org.apache.hadoop.conf.Configuration;
|
|
import org.apache.hadoop.conf.Configuration;
|
|
import org.apache.hadoop.fs.Path;
|
|
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.DatanodeID;
|
|
import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
|
|
import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
|
|
import org.apache.hadoop.hdfs.protocol.ErasureCodingPolicy;
|
|
import org.apache.hadoop.hdfs.protocol.ErasureCodingPolicy;
|
|
@@ -438,7 +439,7 @@ public class TestReconstructStripedFile {
|
|
}
|
|
}
|
|
|
|
|
|
// HDFS-12044
|
|
// HDFS-12044
|
|
- @Test(timeout = 60000)
|
|
|
|
|
|
+ @Test(timeout = 120000)
|
|
public void testNNSendsErasureCodingTasks() throws Exception {
|
|
public void testNNSendsErasureCodingTasks() throws Exception {
|
|
testNNSendsErasureCodingTasks(1);
|
|
testNNSendsErasureCodingTasks(1);
|
|
testNNSendsErasureCodingTasks(2);
|
|
testNNSendsErasureCodingTasks(2);
|
|
@@ -453,6 +454,9 @@ public class TestReconstructStripedFile {
|
|
conf.setInt(DFSConfigKeys.DFS_NAMENODE_REPLICATION_MAX_STREAMS_KEY, 20);
|
|
conf.setInt(DFSConfigKeys.DFS_NAMENODE_REPLICATION_MAX_STREAMS_KEY, 20);
|
|
conf.setInt(DFSConfigKeys.DFS_DN_EC_RECONSTRUCTION_THREADS_KEY,
|
|
conf.setInt(DFSConfigKeys.DFS_DN_EC_RECONSTRUCTION_THREADS_KEY,
|
|
2);
|
|
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)
|
|
cluster = new MiniDFSCluster.Builder(conf)
|
|
.numDataNodes(numDataNodes).build();
|
|
.numDataNodes(numDataNodes).build();
|
|
cluster.waitActive();
|
|
cluster.waitActive();
|