Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[To dev/1.3] [RATISCONSENSUS] Bump ratis version to 3.1.3 #14709 #14952

Merged
merged 1 commit into from
Feb 26, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading