Skip to content

Commit 4287805

Browse files
[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>
1 parent 6cb9035 commit 4287805

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisClient.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,10 @@
2929
import org.apache.ratis.client.RaftClientRpc;
3030
import org.apache.ratis.conf.RaftProperties;
3131
import org.apache.ratis.protocol.RaftGroup;
32-
import org.apache.ratis.protocol.exceptions.LeaderNotReadyException;
3332
import org.apache.ratis.protocol.exceptions.LeaderSteppingDownException;
3433
import org.apache.ratis.protocol.exceptions.NotLeaderException;
3534
import org.apache.ratis.protocol.exceptions.RaftException;
3635
import org.apache.ratis.protocol.exceptions.ReconfigurationInProgressException;
37-
import org.apache.ratis.protocol.exceptions.ReconfigurationTimeoutException;
3836
import org.apache.ratis.protocol.exceptions.ServerNotReadyException;
3937
import org.apache.ratis.protocol.exceptions.TimeoutIOException;
4038
import org.apache.ratis.retry.ExponentialBackoffRetry;
@@ -239,10 +237,8 @@ public Action handleAttemptFailure(Event event) {
239237
|| cause instanceof ReconfigurationInProgressException
240238
|| cause instanceof TimeoutIOException
241239
|| cause instanceof LeaderSteppingDownException
242-
|| cause instanceof ReconfigurationTimeoutException
243240
|| cause instanceof ServerNotReadyException
244-
|| cause instanceof NotLeaderException
245-
|| cause instanceof LeaderNotReadyException) {
241+
|| cause instanceof NotLeaderException) {
246242
return endlessPolicy.handleAttemptFailure(event);
247243
}
248244

iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/utils/Utils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ public static void initRatisConfig(RaftProperties properties, RatisConfig config
253253
GrpcConfigKeys.Server.setLeaderOutstandingAppendsMax(
254254
properties, config.getGrpc().getLeaderOutstandingAppendsMax());
255255

256+
RaftServerConfigKeys.setStagingTimeout(properties, TimeDuration.valueOf(240, TimeUnit.SECONDS));
256257
RaftServerConfigKeys.Rpc.setSlownessTimeout(properties, config.getRpc().getSlownessTimeout());
257258
RaftServerConfigKeys.Rpc.setTimeoutMin(properties, config.getRpc().getTimeoutMin());
258259
RaftServerConfigKeys.Rpc.setTimeoutMax(properties, config.getRpc().getTimeoutMax());

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,14 @@
129129
<osgi.version>7.0.0</osgi.version>
130130
<pax-jdbc-common.version>1.5.6</pax-jdbc-common.version>
131131
<powermock.version>2.0.9</powermock.version>
132-
<ratis-thirdparty-misc.version>1.0.8-7c44349-SNAPSHOT</ratis-thirdparty-misc.version>
132+
<ratis-thirdparty-misc.version>1.0.8</ratis-thirdparty-misc.version>
133133
<!--
134134
This is an unreleased version of a custom branch. The 8-character part after the version number
135135
This is an unreleased version of a custom branch. The 8-character part after the version number
136136
is for ensuring the SNAPSHOT will stay available. We should however have the Ratis folks do a
137137
new release soon, as releasing with this version is more than sub-ideal.
138138
-->
139-
<ratis.version>3.1.2-a862328-SNAPSHOT</ratis.version>
139+
<ratis.version>3.1.3</ratis.version>
140140
<reactive-streams.version>1.0.4</reactive-streams.version>
141141
<reactor-netty.version>1.1.20</reactor-netty.version>
142142
<reactor.version>3.5.18</reactor.version>

0 commit comments

Comments
 (0)