HDFS-9626. TestBlockReplacement#testBlockReplacement fails occasionally. Contributed by Xiao Chen.

Change-Id: I5cee398dfc361121d8b666ffd1203cc14a4ace24
This commit is contained in:
Zhe Zhang 2016-01-08 13:14:36 -08:00
parent d1cbc8442c
commit eef26388ca
2 changed files with 7 additions and 3 deletions

View File

@ -1640,6 +1640,9 @@ Release 2.8.0 - UNRELEASED
HDFS-9619. SimulatedFSDataset sometimes can not find blockpool for the HDFS-9619. SimulatedFSDataset sometimes can not find blockpool for the
correct namenode (Wei-Chiu Chuang via vinayakumarb) correct namenode (Wei-Chiu Chuang via vinayakumarb)
HDFS-9626. TestBlockReplacement#testBlockReplacement fails occasionally.
(Xiao Chen via zhz)
Release 2.7.3 - UNRELEASED Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -198,9 +198,10 @@ public class TestBlockReplacement {
LOG.info("Testcase 4: invalid del hint " + proxies.get(0) ); LOG.info("Testcase 4: invalid del hint " + proxies.get(0) );
assertTrue(replaceBlock(b, proxies.get(0), proxies.get(1), source)); assertTrue(replaceBlock(b, proxies.get(0), proxies.get(1), source));
// after cluster has time to resolve the over-replication, // after cluster has time to resolve the over-replication,
// block locations should contain two proxies, // block locations should contain any 3 of the blocks, since after the
// and either source or newNode, but not both. // deletion the number of racks is still >=2 for sure.
checkBlocks(proxies.toArray(new DatanodeInfo[proxies.size()]), // See HDFS-9314 for details, espacially the comment on 18/Nov/15 14:09.
checkBlocks(new DatanodeInfo[]{},
fileName.toString(), fileName.toString(),
DEFAULT_BLOCK_SIZE, REPLICATION_FACTOR, client); DEFAULT_BLOCK_SIZE, REPLICATION_FACTOR, client);
} finally { } finally {