From b4ed81c4e62ea4b9f7955ab020a8e573373a1e25 Mon Sep 17 00:00:00 2001 From: Arpit Agarwal Date: Wed, 27 Mar 2019 08:23:30 -0700 Subject: [PATCH] HDDS-1332. Add some logging for flaky test testStartStopDatanodeStateMachine. Contributed by Arpit Agarwal. (#649) --- .../common/statemachine/DatanodeStateMachine.java | 1 - .../ozone/container/common/TestDatanodeStateMachine.java | 9 +++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeStateMachine.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeStateMachine.java index 8d2df2c4f2..ff391031a5 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeStateMachine.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeStateMachine.java @@ -397,7 +397,6 @@ public synchronized void stopDaemon() { @VisibleForTesting public boolean isDaemonStopped() { return this.executorService.isShutdown() - && this.getContext().getExecutionCount() == 0 && this.getContext().getState() == DatanodeStates.SHUTDOWN; } diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java index 8b93936d96..84409db350 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java @@ -16,6 +16,7 @@ */ package org.apache.hadoop.ozone.container.common; +import com.google.common.base.Supplier; import com.google.common.collect.Maps; import com.google.common.util.concurrent.ThreadFactoryBuilder; import org.apache.hadoop.conf.Configuration; @@ -165,8 +166,12 @@ public void testStartStopDatanodeStateMachine() throws IOException, stateMachine.startDaemon(); SCMConnectionManager connectionManager = stateMachine.getConnectionManager(); - GenericTestUtils.waitFor(() -> connectionManager.getValues().size() == 1, - 1000, 30000); + GenericTestUtils.waitFor( + () -> { + LOG.info("connectionManager.getValues().size() is {}", + connectionManager.getValues().size()); + return connectionManager.getValues().size() == 1; + }, 1000, 30000); stateMachine.stopDaemon(); assertTrue(stateMachine.isDaemonStopped());