[RATISCONSENSUS] Bump ratis version to 3.1.3 (#14709)

* bump ratis version to 3.1.3 * bump ratis version to 3.1.3 * bump ratis version to 3.1.3 * bump ratis version to 3.1.3 * Update pom.xml --------- Co-authored-by: Potato <tanxinyu@apache.org>
apache · Jan 16, 2025 · 4287805 · 4287805
1 parent 6cb9035
commit 4287805
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisClient.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisClient.java
@@ -29,12 +29,10 @@
 import org.apache.ratis.client.RaftClientRpc;
 import org.apache.ratis.conf.RaftProperties;
 import org.apache.ratis.protocol.RaftGroup;
-import org.apache.ratis.protocol.exceptions.LeaderNotReadyException;
 import org.apache.ratis.protocol.exceptions.LeaderSteppingDownException;
 import org.apache.ratis.protocol.exceptions.NotLeaderException;
 import org.apache.ratis.protocol.exceptions.RaftException;
 import org.apache.ratis.protocol.exceptions.ReconfigurationInProgressException;
-import org.apache.ratis.protocol.exceptions.ReconfigurationTimeoutException;
 import org.apache.ratis.protocol.exceptions.ServerNotReadyException;
 import org.apache.ratis.protocol.exceptions.TimeoutIOException;
 import org.apache.ratis.retry.ExponentialBackoffRetry;
@@ -239,10 +237,8 @@ public Action handleAttemptFailure(Event event) {
           || cause instanceof ReconfigurationInProgressException
           || cause instanceof TimeoutIOException
           || cause instanceof LeaderSteppingDownException
-          || cause instanceof ReconfigurationTimeoutException
           || cause instanceof ServerNotReadyException
-          || cause instanceof NotLeaderException
-          || cause instanceof LeaderNotReadyException) {
+          || cause instanceof NotLeaderException) {
         return endlessPolicy.handleAttemptFailure(event);
       }
 

diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/utils/Utils.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/utils/Utils.java
@@ -253,6 +253,7 @@ public static void initRatisConfig(RaftProperties properties, RatisConfig config
     GrpcConfigKeys.Server.setLeaderOutstandingAppendsMax(
         properties, config.getGrpc().getLeaderOutstandingAppendsMax());
 
+    RaftServerConfigKeys.setStagingTimeout(properties, TimeDuration.valueOf(240, TimeUnit.SECONDS));
     RaftServerConfigKeys.Rpc.setSlownessTimeout(properties, config.getRpc().getSlownessTimeout());
     RaftServerConfigKeys.Rpc.setTimeoutMin(properties, config.getRpc().getTimeoutMin());
     RaftServerConfigKeys.Rpc.setTimeoutMax(properties, config.getRpc().getTimeoutMax());

diff --git a/pom.xml b/pom.xml
@@ -129,14 +129,14 @@
         <osgi.version>7.0.0</osgi.version>
         <pax-jdbc-common.version>1.5.6</pax-jdbc-common.version>
         <powermock.version>2.0.9</powermock.version>
-        <ratis-thirdparty-misc.version>1.0.8-7c44349-SNAPSHOT</ratis-thirdparty-misc.version>
+        <ratis-thirdparty-misc.version>1.0.8</ratis-thirdparty-misc.version>
         <!--
       This is an unreleased version of a custom branch. The 8-character part after the version number
       This is an unreleased version of a custom branch. The 8-character part after the version number
       is for ensuring the SNAPSHOT will stay available. We should however have the Ratis folks do a
       new release soon, as releasing with this version is more than sub-ideal.
     -->
-        <ratis.version>3.1.2-a862328-SNAPSHOT</ratis.version>
+        <ratis.version>3.1.3</ratis.version>
         <reactive-streams.version>1.0.4</reactive-streams.version>
         <reactor-netty.version>1.1.20</reactor-netty.version>
         <reactor.version>3.5.18</reactor.version>