Repository: hadoop Updated Branches: refs/heads/HDFS-7240 5d0a206a6 -> a13c9782a
HDFS-11158. Ozone: TestDatanodeStateMachine is failing intermittently. Contributed by Weiwei Yang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a13c9782 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a13c9782 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a13c9782 Branch: refs/heads/HDFS-7240 Commit: a13c9782a38946e05a497e3000bc4ccaa960d30f Parents: 5d0a206 Author: Anu Engineer <[email protected]> Authored: Tue Mar 7 10:02:16 2017 -0800 Committer: Anu Engineer <[email protected]> Committed: Tue Mar 7 10:02:16 2017 -0800 ---------------------------------------------------------------------- .../common/TestDatanodeStateMachine.java | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a13c9782/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java index bd671ed..d9e4cd7 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java @@ -118,23 +118,12 @@ public class TestDatanodeStateMachine { @Test public void testDatanodeStateMachineStartThread() throws IOException, InterruptedException, TimeoutException { - final DatanodeStateMachine stateMachine = new DatanodeStateMachine(conf); - Runnable startStateMachineTask = () -> { - try { - stateMachine.start(); - } catch (Exception ex) { - } - }; - Thread thread1 = new Thread(startStateMachineTask); - thread1.setDaemon(true); - thread1.start(); - + DatanodeStateMachine stateMachine = + DatanodeStateMachine.initStateMachine(conf); SCMConnectionManager connectionManager = stateMachine.getConnectionManager(); - - GenericTestUtils.waitFor(() -> connectionManager.getValues().size() == 3 , - 100, 1000); - + GenericTestUtils.waitFor(() -> connectionManager.getValues().size() == 3, + 1000, 30000); stateMachine.close(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
