Repository: hadoop Updated Branches: refs/heads/branch-2.7 9bc9e13a9 -> 006ed54a1
HDFS-9880. TestDatanodeRegistration fails occasionally. Contributed by Kihwal Lee. (cherry picked from commit e76b13c415459e4062c4c9660a16759a11ffb34a) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/006ed54a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/006ed54a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/006ed54a Branch: refs/heads/branch-2.7 Commit: 006ed54a16a966dda90ec6bf07b865378f3e62ab Parents: 9bc9e13 Author: Kihwal Lee <[email protected]> Authored: Tue Mar 1 17:02:43 2016 -0600 Committer: Kihwal Lee <[email protected]> Committed: Tue Mar 1 17:02:43 2016 -0600 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../java/org/apache/hadoop/hdfs/TestDatanodeRegistration.java | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/006ed54a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index cd7ac35..6773217 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -124,6 +124,8 @@ Release 2.7.3 - UNRELEASED HDFS-9864. Correct reference for RENEWDELEGATIONTOKEN and CANCELDELEGATIONTOKEN in webhdfs doc. (Brahma Reddy Battula via aajisaka) + HDFS-9880. TestDatanodeRegistration fails occasionally (kihwal) + Release 2.7.2 - 2016-01-25 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/006ed54a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeRegistration.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeRegistration.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeRegistration.java index 9d50c7e..180f45b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeRegistration.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeRegistration.java @@ -325,7 +325,7 @@ public class TestDatanodeRegistration { // should not occur other than dead/unregistered node which will trigger a // re-registration. If a non-IPC exception does occur, the safety net is // a forced re-registration on the next heartbeat. - @Test(timeout=10000) + @Test public void testForcedRegistration() throws Exception { final Configuration conf = new HdfsConfiguration(); conf.setInt(DFSConfigKeys.DFS_NAMENODE_HANDLER_COUNT_KEY, 4); @@ -440,10 +440,10 @@ public class TestDatanodeRegistration { public Boolean get() { return lastCount != storage.getBlockReportCount(); } - }, 10, 100); + }, 10, 2000); } catch (TimeoutException te) { return false; } return true; } -} \ No newline at end of file +}
