This is an automated email from the ASF dual-hosted git repository. tanxinyu pushed a commit to branch bump_ratis_cp in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit d4927cd01a33433a0e429a5fff1e2a1b34d66ffd Author: William Song <[email protected]> AuthorDate: Thu Jan 16 18:08:30 2025 +0800 [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 <[email protected]> --- .../src/main/java/org/apache/iotdb/consensus/ratis/RatisClient.java | 6 +----- .../src/main/java/org/apache/iotdb/consensus/ratis/utils/Utils.java | 1 + pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 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 index 7f0565e782e..43f0a82561c 100644 --- 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.RaftClient; 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 @@ class RatisClient implements AutoCloseable { || 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 index bb32631a1b4..07dac6f8cf2 100644 --- 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 class Utils { 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 index 816a459b685..b4b9b22e723 100644 --- 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>
