hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kih...@apache.org
Subject hadoop git commit: HDFS-9880. TestDatanodeRegistration fails occasionally. Contributed by Kihwal Lee.
Date Tue, 01 Mar 2016 23:02:23 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 f563c5353 -> 2c8733a19


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/2c8733a1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2c8733a1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2c8733a1

Branch: refs/heads/branch-2.8
Commit: 2c8733a19da92d02caadc0340ff245bd188a2ab9
Parents: f563c53
Author: Kihwal Lee <kihwal@apache.org>
Authored: Tue Mar 1 17:02:08 2016 -0600
Committer: Kihwal Lee <kihwal@apache.org>
Committed: Tue Mar 1 17:02:08 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/2c8733a1/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 69980c2..d26e523 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1924,6 +1924,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/2c8733a1/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 ccac99f..46bf2ca 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
+}


Mime
View raw message