Session insert request won't fail while rolling upgrade

Caideyipi · Jan 28, 2024 · 9831082 · 9831082
1 parent e7b0ca5
commit 9831082
Show file tree

Hide file tree

Showing 12 changed files with 1,289 additions and 842 deletions.
diff --git a/iotdb-client/isession/src/main/java/org/apache/iotdb/isession/SessionConfig.java b/iotdb-client/isession/src/main/java/org/apache/iotdb/isession/SessionConfig.java
@@ -52,5 +52,9 @@ public class SessionConfig {
 
   public static final boolean DEFAULT_ENABLE_AUTO_FETCH = true;
 
+  public static final int MAX_RETRY_COUNT = 60;
+
+  public static final long RETRY_INTERVAL_IN_MS = 500;
+
   private SessionConfig() {}
 }
diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/Session.java b/iotdb-client/session/src/main/java/org/apache/iotdb/session/Session.java
@@ -162,6 +162,10 @@ public class Session implements ISession {
   // default enable
   protected boolean enableAutoFetch = true;
 
+  protected int maxRetryCount = SessionConfig.MAX_RETRY_COUNT;
+
+  protected long retryIntervalInMs = SessionConfig.RETRY_INTERVAL_IN_MS;
+
   private static final String REDIRECT_TWICE = "redirect twice";
 
   private static final String REDIRECT_TWICE_RETRY = "redirect twice, please try again.";
@@ -421,6 +425,8 @@ public Session(Builder builder) {
     this.trustStore = builder.trustStore;
     this.trustStorePwd = builder.trustStorePwd;
     this.enableAutoFetch = builder.enableAutoFetch;
+    this.maxRetryCount = builder.maxRetryCount;
+    this.retryIntervalInMs = builder.retryIntervalInMs;
   }
 
   @Override
@@ -580,9 +586,11 @@ public synchronized void close() throws IoTDBConnectionException {
   public SessionConnection constructSessionConnection(
       Session session, TEndPoint endpoint, ZoneId zoneId) throws IoTDBConnectionException {
     if (endpoint == null) {
-      return new SessionConnection(session, zoneId, availableNodes);
+      return new SessionConnection(
+          session, zoneId, availableNodes, maxRetryCount, retryIntervalInMs);
     }
-    return new SessionConnection(session, endpoint, zoneId, availableNodes);
+    return new SessionConnection(
+        session, endpoint, zoneId, availableNodes, maxRetryCount, retryIntervalInMs);
   }
 
   @Override
@@ -1261,7 +1269,6 @@ private void handleRedirection(String deviceId, TEndPoint endpoint) {
               });
       if (connection == null) {
         deviceIdToEndpoint.remove(deviceId);
-        logger.warn("Can not redirect to {}, because session can not connect to it.", endpoint);
       }
     }
   }
@@ -3551,6 +3558,10 @@ public static class Builder {
     private String trustStore;
     private String trustStorePwd;
 
+    private int maxRetryCount = SessionConfig.MAX_RETRY_COUNT;
+
+    private long retryIntervalInMs = SessionConfig.RETRY_INTERVAL_IN_MS;
+
     public Builder useSSL(boolean useSSL) {
       this.useSSL = useSSL;
       return this;
@@ -3633,6 +3644,16 @@ public Builder enableAutoFetch(boolean enableAutoFetch) {
       return this;
     }
 
+    public Builder maxRetryCount(int maxRetryCount) {
+      this.maxRetryCount = maxRetryCount;
+      return this;
+    }
+
+    public Builder retryIntervalInMs(long retryIntervalInMs) {
+      this.retryIntervalInMs = retryIntervalInMs;
+      return this;
+    }
+
     public Session build() {
       if (nodeUrls != null
           && (!SessionConfig.DEFAULT_HOST.equals(host) || rpcPort != SessionConfig.DEFAULT_PORT)) {