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 na...@apache.org on 2019/03/27 15:23:40 UTC
[hadoop] branch trunk updated: HDDS-1332. Add some logging for
flaky test testStartStopDatanodeStateMachine. Contributed by Arpit Agarwal.
(#649)
This is an automated email from the ASF dual-hosted git repository.
nanda pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new b4ed81c HDDS-1332. Add some logging for flaky test testStartStopDatanodeStateMachine. Contributed by Arpit Agarwal. (#649)
b4ed81c is described below
commit b4ed81c4e62ea4b9f7955ab020a8e573373a1e25
Author: Arpit Agarwal <ar...@users.noreply.github.com>
AuthorDate: Wed Mar 27 08:23:30 2019 -0700
HDDS-1332. Add some logging for flaky test testStartStopDatanodeStateMachine. Contributed by Arpit Agarwal. (#649)
---
.../container/common/statemachine/DatanodeStateMachine.java | 1 -
.../hadoop/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 8d2df2c..ff39103 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 class DatanodeStateMachine implements Closeable {
@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 8b93936..84409db 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 class TestDatanodeStateMachine {
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());
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org