This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch rc/2.0.7 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit d57e80a0eab5adb970db3cb06a89e42e90455c8b Author: CritasWang <[email protected]> AuthorDate: Tue Nov 11 10:44:50 2025 +0800 chore!: Bind real config address for Thrift and Raft services (#16717) * chore: Bind real internal address for Thrift and Raft services * keep ExternalRpcAddress use config value * Update iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/ExternalRPCService.java Co-authored-by: Haonan <[email protected]> --------- Co-authored-by: Haonan <[email protected]> (cherry picked from commit 8dbf2003cfde4c2f68fa5fd4e3110c5e7aa334b5) --- .../org/apache/iotdb/consensus/ratis/RatisConsensus.java | 1 + .../commons/service/AbstractThriftServiceThread.java | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java index ff16434df14..5f212ed2fbd 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java @@ -156,6 +156,7 @@ class RatisConsensus implements IConsensus { this.storageDir = new File(config.getStorageDir()); RaftServerConfigKeys.setStorageDir(properties, Collections.singletonList(storageDir)); + GrpcConfigKeys.Server.setHost(properties, config.getThisNodeEndPoint().getIp()); GrpcConfigKeys.Server.setPort(properties, config.getThisNodeEndPoint().getPort()); Utils.initRatisConfig(properties, config.getRatisConfig()); diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/AbstractThriftServiceThread.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/AbstractThriftServiceThread.java index 2afc66cfe7d..8529c146177 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/AbstractThriftServiceThread.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/AbstractThriftServiceThread.java @@ -271,14 +271,21 @@ public abstract class AbstractThriftServiceThread extends Thread { @SuppressWarnings("java:S2259") private TServerTransport openTransport(String bindAddress, int port) throws TTransportException { - // bind any address - return new TServerSocket(new InetSocketAddress(port)); + if (bindAddress == null) { + // bind any address + return new TServerSocket(new InetSocketAddress(port)); + } + return new TServerSocket(new InetSocketAddress(bindAddress, port)); } private TServerTransport openNonblockingTransport( String bindAddress, int port, int connectionTimeoutInMS) throws TTransportException { - // bind any address - return new TNonblockingServerSocket(new InetSocketAddress(port), connectionTimeoutInMS); + if (bindAddress == null) { + // bind any address + return new TNonblockingServerSocket(new InetSocketAddress(port), connectionTimeoutInMS); + } + return new TNonblockingServerSocket( + new InetSocketAddress(bindAddress, port), connectionTimeoutInMS); } public void setThreadStopLatch(CountDownLatch threadStopLatch) {
