HDFS-3931. TestDatanodeBlockScanner#testBlockCorruptionPolicy2 is broken. Contributed by Andy Isaacson
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1388332 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
b3e947bc50
commit
d2ecafd64f
|
@ -39,6 +39,9 @@ Release 2.0.3-alpha - Unreleased
|
|||
HDFS-3932. NameNode Web UI broken if the rpc-address is set to the wildcard.
|
||||
(Colin Patrick McCabe via eli)
|
||||
|
||||
HDFS-3931. TestDatanodeBlockScanner#testBlockCorruptionPolicy2 is broken.
|
||||
(Andy Isaacson via eli)
|
||||
|
||||
Release 2.0.2-alpha - 2012-09-07
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -506,7 +506,7 @@ public class DFSTestUtil {
|
|||
public static void waitReplication(FileSystem fs, Path fileName, short replFactor)
|
||||
throws IOException, InterruptedException, TimeoutException {
|
||||
boolean correctReplFactor;
|
||||
final int ATTEMPTS = 20;
|
||||
final int ATTEMPTS = 40;
|
||||
int count = 0;
|
||||
|
||||
do {
|
||||
|
|
|
@ -269,6 +269,7 @@ public class TestDatanodeBlockScanner {
|
|||
conf.setLong(DFSConfigKeys.DFS_NAMENODE_REPLICATION_INTERVAL_KEY, 3);
|
||||
conf.setLong(DFSConfigKeys.DFS_HEARTBEAT_INTERVAL_KEY, 3L);
|
||||
conf.setBoolean(DFSConfigKeys.DFS_NAMENODE_REPLICATION_CONSIDERLOAD_KEY, false);
|
||||
conf.setLong(DFSConfigKeys.DFS_NAMENODE_REPLICATION_PENDING_TIMEOUT_SEC_KEY, 5L);
|
||||
|
||||
MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).numDataNodes(numDataNodes).build();
|
||||
cluster.waitActive();
|
||||
|
@ -276,10 +277,12 @@ public class TestDatanodeBlockScanner {
|
|||
Path file1 = new Path("/tmp/testBlockCorruptRecovery/file");
|
||||
DFSTestUtil.createFile(fs, file1, 1024, numReplicas, 0);
|
||||
ExtendedBlock block = DFSTestUtil.getFirstBlock(fs, file1);
|
||||
final int ITERATIONS = 10;
|
||||
|
||||
// Wait until block is replicated to numReplicas
|
||||
DFSTestUtil.waitReplication(fs, file1, numReplicas);
|
||||
|
||||
for (int k = 0; ; k++) {
|
||||
// Corrupt numCorruptReplicas replicas of block
|
||||
int[] corruptReplicasDNIDs = new int[numCorruptReplicas];
|
||||
for (int i=0, j=0; (j != numCorruptReplicas) && (i < numDataNodes); i++) {
|
||||
|
@ -303,8 +306,18 @@ public class TestDatanodeBlockScanner {
|
|||
}
|
||||
|
||||
// Loop until all corrupt replicas are reported
|
||||
try {
|
||||
DFSTestUtil.waitCorruptReplicas(fs, cluster.getNamesystem(), file1,
|
||||
block, numCorruptReplicas);
|
||||
} catch(TimeoutException e) {
|
||||
if (k > ITERATIONS) {
|
||||
throw e;
|
||||
}
|
||||
LOG.info("Timed out waiting for corrupt replicas, trying again, iteration " + k);
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
// Loop until the block recovers after replication
|
||||
DFSTestUtil.waitReplication(fs, file1, numReplicas);
|
||||
|
|
Loading…
Reference in New Issue