HDFS-9880. TestDatanodeRegistration fails occasionally. Contributed by Kihwal Lee.

(cherry picked from commit e76b13c415)
This commit is contained in:
Kihwal Lee 2016-03-01 17:02:08 -06:00
parent f563c53535
commit 2c8733a19d
2 changed files with 5 additions and 3 deletions

View File

@ -1924,6 +1924,8 @@ Release 2.7.3 - UNRELEASED
HDFS-9864. Correct reference for RENEWDELEGATIONTOKEN and HDFS-9864. Correct reference for RENEWDELEGATIONTOKEN and
CANCELDELEGATIONTOKEN in webhdfs doc. (Brahma Reddy Battula via aajisaka) CANCELDELEGATIONTOKEN in webhdfs doc. (Brahma Reddy Battula via aajisaka)
HDFS-9880. TestDatanodeRegistration fails occasionally (kihwal)
Release 2.7.2 - 2016-01-25 Release 2.7.2 - 2016-01-25
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -325,7 +325,7 @@ public class TestDatanodeRegistration {
// should not occur other than dead/unregistered node which will trigger a // 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 // re-registration. If a non-IPC exception does occur, the safety net is
// a forced re-registration on the next heartbeat. // a forced re-registration on the next heartbeat.
@Test(timeout=10000) @Test
public void testForcedRegistration() throws Exception { public void testForcedRegistration() throws Exception {
final Configuration conf = new HdfsConfiguration(); final Configuration conf = new HdfsConfiguration();
conf.setInt(DFSConfigKeys.DFS_NAMENODE_HANDLER_COUNT_KEY, 4); conf.setInt(DFSConfigKeys.DFS_NAMENODE_HANDLER_COUNT_KEY, 4);
@ -440,7 +440,7 @@ public class TestDatanodeRegistration {
public Boolean get() { public Boolean get() {
return lastCount != storage.getBlockReportCount(); return lastCount != storage.getBlockReportCount();
} }
}, 10, 100); }, 10, 2000);
} catch (TimeoutException te) { } catch (TimeoutException te) {
return false; return false;
} }