You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2016/03/04 02:02:11 UTC
[32/50] [abbrv] hadoop git commit: HDFS-9880.
TestDatanodeRegistration fails occasionally. Contributed by Kihwal Lee.
HDFS-9880. TestDatanodeRegistration fails occasionally. Contributed by Kihwal Lee.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e76b13c4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e76b13c4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e76b13c4
Branch: refs/heads/HDFS-1312
Commit: e76b13c415459e4062c4c9660a16759a11ffb34a
Parents: f98dff3
Author: Kihwal Lee <ki...@apache.org>
Authored: Tue Mar 1 17:00:18 2016 -0600
Committer: Kihwal Lee <ki...@apache.org>
Committed: Tue Mar 1 17:00:18 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/e76b13c4/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 39650e8..464891d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -2963,6 +2963,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/e76b13c4/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 5870321..b6ae281 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
@@ -324,7 +324,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);
@@ -439,10 +439,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
+}