HDFS-12578. TestDeadDatanode#testNonDFSUsedONDeadNodeReReg failing in branch-2.7. Contributed by Ajay Kumar.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d101b980 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d101b980 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d101b980 Branch: refs/heads/branch-2.7 Commit: d101b980a14d045da208a252634498f4eceed20d Parents: 171a0bd Author: Xiao Chen <x...@apache.org> Authored: Fri Oct 13 14:16:09 2017 -0700 Committer: Xiao Chen <x...@apache.org> Committed: Fri Oct 13 14:24:04 2017 -0700 ---------------------------------------------------------------------- .../hadoop/hdfs/server/blockmanagement/BlockManagerTestUtil.java | 4 +++- .../org/apache/hadoop/hdfs/server/namenode/TestDeadDatanode.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d101b980/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerTestUtil.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerTestUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerTestUtil.java index 497ad58..48c6953 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerTestUtil.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerTestUtil.java @@ -233,7 +233,9 @@ public class BlockManagerTestUtil { * @param bm the BlockManager to manipulate */ public static void checkHeartbeat(BlockManager bm) { - bm.getDatanodeManager().getHeartbeatManager().heartbeatCheck(); + HeartbeatManager hbm = bm.getDatanodeManager().getHeartbeatManager(); + hbm.restartHeartbeatStopWatch(); + hbm.heartbeatCheck(); } /** http://git-wip-us.apache.org/repos/asf/hadoop/blob/d101b980/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDeadDatanode.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDeadDatanode.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDeadDatanode.java index 00ea58f..777845a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDeadDatanode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDeadDatanode.java @@ -137,7 +137,8 @@ public class TestDeadDatanode { public void testNonDFSUsedONDeadNodeReReg() throws Exception { Configuration conf = new HdfsConfiguration(); conf.setInt(DFSConfigKeys.DFS_HEARTBEAT_INTERVAL_KEY, 1); - conf.setInt(DFSConfigKeys.DFS_NAMENODE_HEARTBEAT_RECHECK_INTERVAL_KEY, 1); + conf.setInt(DFSConfigKeys.DFS_NAMENODE_HEARTBEAT_RECHECK_INTERVAL_KEY, + 3000); conf.setInt(DFSConfigKeys.DFS_NAMENODE_STALE_DATANODE_INTERVAL_KEY, 6 * 1000); try { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
