HDDS-4176. Fix failed UT: test2WayCommitForTimeoutException (#1370)

Author: runzhiwang

hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java

@@ -583,6 +583,11 @@ public static String getFixedLengthString(String string, int length) {
 
   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 =

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestWatchForCommit.java

@@ -21,6 +21,7 @@
 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 void test2WayCommitForTimeoutException() throws Exception {
             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;
       }