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/09/02 02:15:16 UTC
[hadoop-ozone] branch master updated: HDDS-4176. Fix failed UT:
test2WayCommitForTimeoutException (#1370)
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/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 9cef3f6 HDDS-4176. Fix failed UT: test2WayCommitForTimeoutException (#1370)
9cef3f6 is described below
commit 9cef3f63384d643ca8d25ea70d87f5415f92bc88
Author: runzhiwang <51...@users.noreply.github.com>
AuthorDate: Wed Sep 2 10:15:01 2020 +0800
HDDS-4176. Fix failed UT: test2WayCommitForTimeoutException (#1370)
---
.../java/org/apache/hadoop/ozone/container/ContainerTestHelper.java | 5 +++++
.../java/org/apache/hadoop/ozone/client/rpc/TestWatchForCommit.java | 5 ++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java
index 45fe38b..b8ebaec 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java
@@ -583,6 +583,11 @@ public final class ContainerTestHelper {
private static RaftServerImpl getRaftServerImpl(HddsDatanodeService dn,
Pipeline pipeline) throws Exception {
+ if (!pipeline.getNodes().contains(dn.getDatanodeDetails())) {
+ throw new IllegalArgumentException("Pipeline:" + pipeline.getId() +
+ " not exist in datanode:" + dn.getDatanodeDetails().getUuid());
+ }
+
XceiverServerSpi server = dn.getDatanodeStateMachine().
getContainer().getWriteChannel();
RaftServerProxy proxy =
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestWatchForCommit.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestWatchForCommit.java
index df08713..c918b9b 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestWatchForCommit.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestWatchForCommit.java
@@ -21,6 +21,7 @@ import org.apache.hadoop.conf.StorageUnit;
import org.apache.hadoop.hdds.client.ReplicationType;
import org.apache.hadoop.hdds.conf.DatanodeRatisServerConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.ratis.conf.RatisClientConfig;
import org.apache.hadoop.hdds.scm.*;
@@ -297,9 +298,11 @@ public class TestWatchForCommit {
xceiverClient.getPipeline()));
reply.getResponse().get();
Assert.assertEquals(3, ratisClient.getCommitInfoMap().size());
+ List<DatanodeDetails> nodesInPipeline = pipeline.getNodes();
for (HddsDatanodeService dn : cluster.getHddsDatanodes()) {
// shutdown the ratis follower
- if (ContainerTestHelper.isRatisFollower(dn, pipeline)) {
+ if (nodesInPipeline.contains(dn.getDatanodeDetails())
+ && ContainerTestHelper.isRatisFollower(dn, pipeline)) {
cluster.shutdownHddsDatanode(dn.getDatanodeDetails());
break;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org