This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch ssl_between_nodes in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 23dc90a45433197bee27da979e2b52c5fb55a3e5 Author: HTHou <[email protected]> AuthorDate: Wed Jun 25 09:36:19 2025 +0800 deving --- .../apache/iotdb/rpc/NettyTNonBlockingTransport.java | 13 +++++-------- .../iotdb/confignode/manager/load/LoadManager.java | 2 +- .../manager/load/service/HeartbeatService.java | 18 +++++++++--------- .../org/apache/iotdb/commons/conf/CommonConfig.java | 2 +- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/NettyTNonBlockingTransport.java b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/NettyTNonBlockingTransport.java index 63f4611d325..1996a21f6a3 100644 --- a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/NettyTNonBlockingTransport.java +++ b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/NettyTNonBlockingTransport.java @@ -33,8 +33,6 @@ import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioSocketChannel; -import io.netty.handler.codec.ByteToMessageDecoder; -import io.netty.handler.codec.MessageToByteEncoder; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContextBuilder; import io.netty.handler.ssl.SslHandler; @@ -57,7 +55,6 @@ import java.nio.channels.SelectableChannel; import java.nio.channels.SelectionKey; import java.nio.channels.Selector; import java.security.KeyStore; -import java.util.List; import java.util.Set; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; @@ -198,10 +195,10 @@ public class NettyTNonBlockingTransport extends TNonblockingTransport { try { ByteBuf byteBuf = readQueue.take(); -// if (byteBuf == null) { -// logger.info("No data available for ByteBuffer read (non-blocking)"); -// return 0; // 非阻塞读取，没有数据时返回 0 -// } + // if (byteBuf == null) { + // logger.info("No data available for ByteBuffer read (non-blocking)"); + // return 0; // 非阻塞读取，没有数据时返回 0 + // } int available = Math.min(buffer.remaining(), byteBuf.readableBytes()); if (available > 0) { @@ -350,7 +347,7 @@ public class NettyTNonBlockingTransport extends TNonblockingTransport { return false; // 异步连接，立即返回 false } catch (Exception e) { connecting.set(false); -// throw new IOException("Failed to start connection", e); + // throw new IOException("Failed to start connection", e); return false; } } diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/LoadManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/LoadManager.java index c1651039ec5..b2f8a9189b3 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/LoadManager.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/LoadManager.java @@ -152,7 +152,7 @@ public class LoadManager { statisticsService.startLoadStatisticsService(); eventService.startEventService(); partitionBalancer.setupPartitionBalancer(); -// topologyService.startTopologyService(); + // topologyService.startTopologyService(); } public void stopLoadServices() { diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/service/HeartbeatService.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/service/HeartbeatService.java index 63a6da33fc3..e079fac021f 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/service/HeartbeatService.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/service/HeartbeatService.java @@ -278,15 +278,15 @@ public class HeartbeatService { configManager.getPipeManager().getPipeRuntimeCoordinator()); configManager.getClusterQuotaManager().updateSpaceQuotaUsage(); addConfigNodeLocationsToReq(dataNodeId, heartbeatReq); - if (CommonDescriptor.getInstance().getConfig().isEnableSSL()) { - SyncDataNodeHeartbeatClientPool.getInstance() - .getDataNodeHeartBeat( - dataNodeInfo.getLocation().getInternalEndPoint(), heartbeatReq, handler); - } else { - AsyncDataNodeHeartbeatClientPool.getInstance() - .getDataNodeHeartBeat( - dataNodeInfo.getLocation().getInternalEndPoint(), heartbeatReq, handler); - } +// if (CommonDescriptor.getInstance().getConfig().isEnableSSL()) { +// SyncDataNodeHeartbeatClientPool.getInstance() +// .getDataNodeHeartBeat( +// dataNodeInfo.getLocation().getInternalEndPoint(), heartbeatReq, handler); +// } else { + AsyncDataNodeHeartbeatClientPool.getInstance() + .getDataNodeHeartBeat( + dataNodeInfo.getLocation().getInternalEndPoint(), heartbeatReq, handler); +// } } } diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java index aa58082664d..b75aa59f319 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java @@ -406,7 +406,7 @@ public class CommonConfig { private volatile Pattern trustedUriPattern = Pattern.compile("file:.*"); /** Enable the thrift Service ssl. */ - private boolean enableSSL = true; + private boolean enableSSL = false; /** ssl key Store Path. */ private String keyStorePath = "/Users/ht/.keystore";
