Skip to content

[to dev/1.3] fix AbstractEnv.ensureNodeStatus #17447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shuwenwei wants to merge 2 commits into
base: dev/1.3
Choose a base branch
from
+24 −4
Open

[to dev/1.3] fix AbstractEnv.ensureNodeStatus #17447

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26b6b4e
fix AbstractEnv.ensureNodeStatus
shuwenwei Apr 8, 2026
83ac944
fix
shuwenwei Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions integration-test/src/main/java/org/apache/iotdb/it/env/cluster/env/AbstractEnv.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@
import org.apache.iotdb.session.Session;
import org.apache.iotdb.session.pool.SessionPool;

import org.apache.thrift.TConfiguration;
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;
Expand Down Expand Up @@ -1119,7 +1122,7 @@ public void shutdownForciblyAllDataNodes() {

@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++) {
Expand Down Expand Up @@ -1147,20 +1150,37 @@ public void ensureNodeStatus(
+ 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
errorMessages.add("The node " + nodes.get(j).getIpAndPortString() + " is not found!");
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(new TConfiguration(), ip, port, 1000)) {
socket.open();
} catch (final TTransportException e) {
errorMessages.add(
String.format(
"DataNode %s is not reachable: %s",
nodeWrapper.getIpAndPortString(), e.getMessage()));
}
}
}
if (errorMessages.isEmpty()) {
Expand Down
Loading