(iotdb) branch master updated: add patch (#15499)

[yongzao]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 325b414c237 add patch (#15499)
325b414c237 is described below

commit 325b414c237c515b7256f3c9b770de147f713411
Author: William Song <48054931+szywill...@users.noreply.github.com>
AuthorDate: Thu May 22 08:10:50 2025 +0800

    add patch (#15499)
---
 .../src/main/java/org/apache/iotdb/session/SessionConnection.java      | 3 +++
 .../confignode/manager/load/cache/detector/PhiAccrualDetector.java     | 2 +-
 .../apache/iotdb/confignode/manager/load/service/TopologyService.java  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
 
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
index 58d46d4b5a3..491071f093a 100644
--- 
a/iotdb-client/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
+++ 
b/iotdb-client/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
@@ -904,6 +904,8 @@ public class SessionConnection {
         return new RetryResult<>(result, null, retryAttempt);
       }
 
+      logger.debug(
+          "Retry attempt #{}, result {}, exception {}", retryAttempt, result, 
lastTException);
       // prepare for the next retry
       if (lastTException != null
           || !availableNodes.get().contains(this.endPoint)
@@ -911,6 +913,7 @@ public class SessionConnection {
         // 1. the current datanode is unreachable (TException)
         // 2. the current datanode is partitioned with other nodes (not in 
availableNodes)
         // 3. asymmetric network partition
+        logger.debug("Retry attempt #{}, Reconnecting to other datanode", 
retryAttempt);
         reconnect();
       }
       try {
diff --git 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/cache/detector/PhiAccrualDetector.java
 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/cache/detector/PhiAccrualDetector.java
index cef58c77df0..3ed78e53c88 100644
--- 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/cache/detector/PhiAccrualDetector.java
+++ 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/cache/detector/PhiAccrualDetector.java
@@ -92,7 +92,7 @@ public class PhiAccrualDetector implements IFailureDetector {
       }
       builder.append(phiAccrual.timeElapsedSinceLastHeartbeat / 1000_000);
       builder.append("]");
-      LOGGER.info(String.format("Node Down, heartbeat history (ms): %s", 
builder));
+      LOGGER.info(String.format("Node %s Down, heartbeat history (ms): %s", 
id, builder));
     }
 
     return isAvailable;
diff --git 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/service/TopologyService.java
 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/service/TopologyService.java
index c1a48dd49cb..3a4ff73ecae 100644
--- 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/service/TopologyService.java
+++ 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/service/TopologyService.java
@@ -228,7 +228,7 @@ public class TopologyService implements Runnable, 
IClusterStatusSubscriber {
           && !failureDetector.isAvailable(entry.getKey(), entry.getValue())) {
         LOGGER.debug("Connection from DataNode {} to DataNode {} is broken", 
fromId, toId);
       } else {
-        latestTopology.get(fromId).add(toId);
+        Optional.ofNullable(latestTopology.get(fromId)).ifPresent(s -> 
s.add(toId));
       }
     }