HDFS-10618. TestPendingReconstruction#testPendingAndInvalidate is flaky due to race condition. Contributed by Eric Badger.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cceb68ff Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cceb68ff Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cceb68ff Branch: refs/heads/HDFS-12996 Commit: cceb68ffeaebe31c11012faa294fe027d04706a8 Parents: ac627f5 Author: Anu Engineer <aengin...@apache.org> Authored: Mon Mar 12 12:07:22 2018 -0700 Committer: Anu Engineer <aengin...@apache.org> Committed: Mon Mar 12 12:07:22 2018 -0700 ---------------------------------------------------------------------- .../server/blockmanagement/TestPendingReconstruction.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/cceb68ff/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingReconstruction.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingReconstruction.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingReconstruction.java index 29ee953..dc37ec06 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingReconstruction.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingReconstruction.java @@ -456,14 +456,14 @@ public class TestPendingReconstruction { "STORAGE_ID", "TEST"); bm.findAndMarkBlockAsCorrupt(block.getBlock(), block.getLocations()[1], "STORAGE_ID", "TEST"); + BlockManagerTestUtil.computeAllPendingWork(bm); + BlockManagerTestUtil.updateState(bm); + assertEquals(bm.getPendingReconstructionBlocksCount(), 1L); + BlockInfo storedBlock = bm.getStoredBlock(block.getBlock().getLocalBlock()); + assertEquals(bm.pendingReconstruction.getNumReplicas(storedBlock), 2); } finally { cluster.getNamesystem().writeUnlock(); } - BlockManagerTestUtil.computeAllPendingWork(bm); - BlockManagerTestUtil.updateState(bm); - assertEquals(bm.getPendingReconstructionBlocksCount(), 1L); - BlockInfo storedBlock = bm.getStoredBlock(block.getBlock().getLocalBlock()); - assertEquals(bm.pendingReconstruction.getNumReplicas(storedBlock), 2); // 4. delete the file fs.delete(filePath, true); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
