You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ad...@apache.org on 2020/12/14 12:57:06 UTC
[ozone] branch master updated: HDDS-4013. FLAKY-UT:
TestWatchForCommit#testWatchForCommitForGroupMismatchException (#1697)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 327c148 HDDS-4013. FLAKY-UT: TestWatchForCommit#testWatchForCommitForGroupMismatchException (#1697)
327c148 is described below
commit 327c148582a793860ad97d46bf55997cc1f15029
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Mon Dec 14 13:56:48 2020 +0100
HDDS-4013. FLAKY-UT: TestWatchForCommit#testWatchForCommitForGroupMismatchException (#1697)
---
.../src/test/java/org/apache/hadoop/ozone/container/TestHelper.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestHelper.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestHelper.java
index 7888e39..8f851e4 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestHelper.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestHelper.java
@@ -24,6 +24,7 @@ import java.util.*;
import java.util.concurrent.TimeoutException;
import org.apache.hadoop.hdds.client.ReplicationType;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.ratis.RatisHelper;
import org.apache.hadoop.hdds.scm.container.ContainerID;
import org.apache.hadoop.hdds.scm.container.ContainerInfo;
@@ -234,12 +235,14 @@ public final class TestHelper {
// wait for the pipeline to get destroyed in the datanodes
for (Pipeline pipeline : pipelineList) {
+ HddsProtos.PipelineID pipelineId = pipeline.getId().getProtobuf();
for (DatanodeDetails dn : pipeline.getNodes()) {
XceiverServerSpi server =
cluster.getHddsDatanodes().get(cluster.getHddsDatanodeIndex(dn))
.getDatanodeStateMachine().getContainer().getWriteChannel();
Assert.assertTrue(server instanceof XceiverServerRatis);
- server.removeGroup(pipeline.getId().getProtobuf());
+ GenericTestUtils.waitFor(() -> !server.isExist(pipelineId),
+ 100, 30_000);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org