Repository: hadoop Updated Branches: refs/heads/branch-2.8 9854682ea -> 1d3fa8701
HDFS-10816. TestComputeInvalidateWork#testDatanodeReRegistration fails due to race between test and replication monitor. Contributed by Eric Badger. (cherry picked from commit e2ea6012311c927cd7bc1524f811411fda4fd6cc) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1d3fa870 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1d3fa870 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1d3fa870 Branch: refs/heads/branch-2.8 Commit: 1d3fa8701151e24e5ab680dd7e7152f8352252fb Parents: 9854682 Author: Kihwal Lee <kih...@apache.org> Authored: Mon Jun 5 15:28:01 2017 -0500 Committer: Kihwal Lee <kih...@apache.org> Committed: Mon Jun 5 15:28:01 2017 -0500 ---------------------------------------------------------------------- .../hdfs/server/blockmanagement/TestComputeInvalidateWork.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1d3fa870/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestComputeInvalidateWork.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestComputeInvalidateWork.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestComputeInvalidateWork.java index c33161f..2e2e039 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestComputeInvalidateWork.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestComputeInvalidateWork.java @@ -63,6 +63,7 @@ public class TestComputeInvalidateWork { namesystem = cluster.getNamesystem(); bm = namesystem.getBlockManager(); nodes = bm.getDatanodeManager().getHeartbeatManager().getDatanodes(); + BlockManagerTestUtil.stopReplicationThread(bm); assertEquals(nodes.length, NUM_OF_DATANODES); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
