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

This commit is contained in:
Kihwal Lee 2016-03-01 17:00:18 -06:00
parent f98dff329b
commit e76b13c415
2 changed files with 5 additions and 3 deletions

View File

@ -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

View File

@ -324,7 +324,7 @@ public void testRegistrationWithDifferentSoftwareVersionsDuringUpgrade()
// 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 @@ private boolean waitForBlockReport(final DataNode dn,
public Boolean get() {
return lastCount != storage.getBlockReportCount();
}
}, 10, 100);
}, 10, 2000);
} catch (TimeoutException te) {
return false;
}
return true;
}
}
}