You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by cr...@apache.org on 2025/11/11 02:50:30 UTC

(iotdb) 01/01: chore!: Bind real config address for Thrift and Raft services (#16717)

This is an automated email from the ASF dual-hosted git repository.

critas pushed a commit to branch wx_address_cp
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 6e7ee2c8a4ea04569e3e8b3c578e4adb168a780a
Author: CritasWang <cr...@outlook.com>
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 <hh...@outlook.com>
    
    ---------
    
    Co-authored-by: Haonan <hh...@outlook.com>
---
 .../java/org/apache/iotdb/consensus/ratis/RatisConsensus.java     | 1 +
 .../apache/iotdb/commons/service/AbstractThriftServiceThread.java | 8 ++++++++
 2 files changed, 9 insertions(+)

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 384730a9742..20c30922432 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 171942d8610..0da0a92e379 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
@@ -283,11 +283,19 @@ public abstract class AbstractThriftServiceThread extends Thread {
 
   @SuppressWarnings("java:S2259")
   private TServerTransport openTransport(String bindAddress, int port) throws TTransportException {
+    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 {
+    if (bindAddress == null) {
+      // bind any address
+      return new TNonblockingServerSocket(new InetSocketAddress(port), connectionTimeoutInMS);
+    }
     return new TNonblockingServerSocket(
         new InetSocketAddress(bindAddress, port), connectionTimeoutInMS);
   }