This is an automated email from the ASF dual-hosted git repository. shuwenwei pushed a commit to branch fixIT0408-1.3 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 26b6b4eb5bec4d88f0865c1921373c5de9bb637c Author: shuwenwei <[email protected]> AuthorDate: Wed Apr 8 17:01:05 2026 +0800 fix AbstractEnv.ensureNodeStatus --- .../iotdb/it/env/cluster/env/AbstractEnv.java | 24 ++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/env/AbstractEnv.java b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/env/AbstractEnv.java index 60ff77aa03c..3813a2890b1 100644 --- a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/env/AbstractEnv.java +++ b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/env/AbstractEnv.java @@ -57,6 +57,8 @@ import org.apache.iotdb.session.Session; import org.apache.iotdb.session.pool.SessionPool; import org.apache.thrift.TException; +import org.apache.thrift.transport.TSocket; +import org.apache.thrift.transport.TTransportException; import org.slf4j.Logger; import java.io.File; @@ -1119,7 +1121,7 @@ public abstract class AbstractEnv implements BaseEnv { @Override public void ensureNodeStatus( - final List<BaseNodeWrapper> nodes, final List<NodeStatus> targetStatus) + final List<BaseNodeWrapper> nodes, final List<NodeStatus> targetStatusList) throws IllegalStateException { Throwable lastException = null; for (int i = 0; i < retryCount; i++) { @@ -1147,7 +1149,9 @@ public abstract class AbstractEnv implements BaseEnv { + node.getClientRpcEndPoint().getPort(), node.getDataNodeId())); for (int j = 0; j < nodes.size(); j++) { - final String endpoint = nodes.get(j).getIpAndPortString(); + BaseNodeWrapper nodeWrapper = nodes.get(j); + String ipAndPortString = nodeWrapper.getIpAndPortString(); + final String endpoint = ipAndPortString; if (!nodeIds.containsKey(endpoint)) { // Node not exist // Notice: Never modify this line, since the NodeLocation might be modified in IT @@ -1155,12 +1159,24 @@ public abstract class AbstractEnv implements BaseEnv { continue; } final String status = showClusterResp.getNodeStatus().get(nodeIds.get(endpoint)); - if (!targetStatus.get(j).getStatus().equals(status)) { + final NodeStatus targetStatus = targetStatusList.get(j); + if (!targetStatus.getStatus().equals(status)) { // Error status errorMessages.add( String.format( "Node %s is in status %s, but expected %s", - endpoint, status, targetStatus.get(j))); + endpoint, status, targetStatusList.get(j))); + continue; + } + if (nodeWrapper instanceof DataNodeWrapper && targetStatus.equals(NodeStatus.Running)) { + final String[] ipPort = nodeWrapper.getIpAndPortString().split(":"); + final String ip = ipPort[0]; + final int port = Integer.parseInt(ipPort[1]); + try (TSocket socket = new TSocket(ip, port)) { + socket.open(); + } catch (final TTransportException e) { + errorMessages.add(e.getMessage()); + } } } if (errorMessages.isEmpty()) {
