This is an automated email from the ASF dual-hosted git repository.
nicholasjiang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/celeborn.git
The following commit(s) were added to refs/heads/main by this push:
new 0a67e2b30 [CELEBORN-2049] Bump Ratis version from 3.1.3 to 3.2.1
0a67e2b30 is described below
commit 0a67e2b304f464bd6199982582f06324a00beca4
Author: SteNicholas <[email protected]>
AuthorDate: Mon Mar 2 18:04:40 2026 +0800
[CELEBORN-2049] Bump Ratis version from 3.1.3 to 3.2.1
### What changes were proposed in this pull request?
Bump Ratis version from 3.1.3 to 3.2.1 including adding options of
`celeborn-ratis sh peer add -peers` in `celeborn_ratis_shell.md` to follow up
https://github.com/apache/ratis/pull/1282.
### Why are the changes needed?
Bump Ratis version from 3.1.3 to 3.2.1. Ratis has released v3.2.1, of which
release note refers to [3.2.1](https://ratis.apache.org/post/3.2.1.html). The
3.2.1 version is a maintenance release with multiple improvements and bugfixes.
The usage of `celeborn-ratis` is as follows:
```
$ celeborn-ratis sh
Usage: ratis sh [generic options]
[election [transfer] [stepDown] [pause] [resume]]
[group [info] [list]]
[local [raftMetaConf]]
[peer [add] [remove] [setPriority]]
[snapshot [create]]
$ celeborn-ratis sh election transfer
Usage: transfer -address <HOSTNAME:PORT> -peers
<PEER0_HOST:PEER0_PORT,PEER1_HOST:PEER1_PORT,PEER2_HOST:PEER2_PORT> [-groupid
<RAFT_GROUP_ID>] [-timeout <TIMEOUT_IN_SECONDS>]
$ celeborn-ratis sh election stepDown
Usage: stepDown -peers
<PEER0_HOST:PEER0_PORT,PEER1_HOST:PEER1_PORT,PEER2_HOST:PEER2_PORT> [-groupid
<RAFT_GROUP_ID>]
$ celeborn-ratis sh election pause
Usage: pause -address <HOSTNAME:PORT> -peers
<PEER0_HOST:PEER0_PORT,PEER1_HOST:PEER1_PORT,PEER2_HOST:PEER2_PORT> [-groupid
<RAFT_GROUP_ID>]
$ celeborn-ratis sh election resume
Usage: resume -address <HOSTNAME:PORT> -peers
<PEER0_HOST:PEER0_PORT,PEER1_HOST:PEER1_PORT,PEER2_HOST:PEER2_PORT> [-groupid
<RAFT_GROUP_ID>]
$ celeborn-ratis sh group info
Usage: info -peers
<PEER0_HOST:PEER0_PORT,PEER1_HOST:PEER1_PORT,PEER2_HOST:PEER2_PORT> [-groupid
<RAFT_GROUP_ID>]
$ celeborn-ratis sh group list
Usage: list -peers
<PEER0_HOST:PEER0_PORT,PEER1_HOST:PEER1_PORT,PEER2_HOST:PEER2_PORT> [-groupid
<RAFT_GROUP_ID>] <[-serverAddress <PEER0_HOST:PEER0_PORT>]|[-peerId <peerId>]>
$ celeborn-ratis sh peer add -peers
Usage: add -peers
<PEER0_HOST:PEER0_PORT,PEER1_HOST:PEER1_PORT,PEER2_HOST:PEER2_PORT> [-groupid
<RAFT_GROUP_ID>] <[-address <PEER0_HOST:PEER0_PORT>]|[-peerId <peerId>]>
[-clientAddress <CLIENT_ADDRESS1,CLIENT_ADDRESS2,...>] [-adminAddress
<ADMIN_ADDRESS1,ADMIN_ADDRESS2,...>]
$ celeborn-ratis sh peer remove -peers
Usage: remove -peers
<PEER0_HOST:PEER0_PORT,PEER1_HOST:PEER1_PORT,PEER2_HOST:PEER2_PORT> [-groupid
<RAFT_GROUP_ID>] <[-address <PEER0_HOST:PEER0_PORT>]|[-peerId <peerId>]>
$ celeborn-ratis sh peer setPriority
Usage: setPriority -peers
<PEER0_HOST:PEER0_PORT,PEER1_HOST:PEER1_PORT,PEER2_HOST:PEER2_PORT> [-groupid
<RAFT_GROUP_ID>] -addressPriority <PEER_HOST:PEER_PORT|PRIORITY>
$ celeborn-ratis sh snapshot create
Usage: create -peers
<PEER0_HOST:PEER0_PORT,PEER1_HOST:PEER1_PORT,PEER2_HOST:PEER2_PORT> [-groupid
<RAFT_GROUP_ID>] [-snapshotTimeout <timeoutInMs>] [-peerId <raftPeerId>]
$ celeborn-ratis sh local raftMetaConf
Usage: raftMetaConf -peers
<[P0_ID|]P0_HOST:P0_PORT,[P1_ID|]P1_HOST:P1_PORT,[P2_ID|]P2_HOST:P2_PORT> -path
<PARENT_PATH_OF_RAFT_META_CONF>
```
### Does this PR resolve a correctness bug?
No.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
CI.
Closes #3612 from SteNicholas/CELEBORN-2049.
Authored-by: SteNicholas <[email protected]>
Signed-off-by: SteNicholas <[email protected]>
---
dev/deps/dependencies-server | 22 +++++++++++-----------
docs/celeborn_ratis_shell.md | 32 ++++++++++++++++----------------
pom.xml | 2 +-
project/CelebornBuild.scala | 2 +-
4 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/dev/deps/dependencies-server b/dev/deps/dependencies-server
index 952751180..e8d7f2e41 100644
--- a/dev/deps/dependencies-server
+++ b/dev/deps/dependencies-server
@@ -126,17 +126,17 @@
osgi-resource-locator/1.0.3//osgi-resource-locator-1.0.3.jar
paranamer/2.8//paranamer-2.8.jar
picocli/4.7.6//picocli-4.7.6.jar
protobuf-java/3.25.5//protobuf-java-3.25.5.jar
-ratis-client/3.1.3//ratis-client-3.1.3.jar
-ratis-common/3.1.3//ratis-common-3.1.3.jar
-ratis-grpc/3.1.3//ratis-grpc-3.1.3.jar
-ratis-metrics-api/3.1.3//ratis-metrics-api-3.1.3.jar
-ratis-metrics-default/3.1.3//ratis-metrics-default-3.1.3.jar
-ratis-netty/3.1.3//ratis-netty-3.1.3.jar
-ratis-proto/3.1.3//ratis-proto-3.1.3.jar
-ratis-server-api/3.1.3//ratis-server-api-3.1.3.jar
-ratis-server/3.1.3//ratis-server-3.1.3.jar
-ratis-shell/3.1.3//ratis-shell-3.1.3.jar
-ratis-thirdparty-misc/1.0.8//ratis-thirdparty-misc-1.0.8.jar
+ratis-client/3.2.1//ratis-client-3.2.1.jar
+ratis-common/3.2.1//ratis-common-3.2.1.jar
+ratis-grpc/3.2.1//ratis-grpc-3.2.1.jar
+ratis-metrics-api/3.2.1//ratis-metrics-api-3.2.1.jar
+ratis-metrics-default/3.2.1//ratis-metrics-default-3.2.1.jar
+ratis-netty/3.2.1//ratis-netty-3.2.1.jar
+ratis-proto/3.2.1//ratis-proto-3.2.1.jar
+ratis-server-api/3.2.1//ratis-server-api-3.2.1.jar
+ratis-server/3.2.1//ratis-server-3.2.1.jar
+ratis-shell/3.2.1//ratis-shell-3.2.1.jar
+ratis-thirdparty-misc/1.0.10//ratis-thirdparty-misc-1.0.10.jar
rocksdbjni/9.10.0//rocksdbjni-9.10.0.jar
scala-library/2.12.18//scala-library-2.12.18.jar
scala-reflect/2.12.18//scala-reflect-2.12.18.jar
diff --git a/docs/celeborn_ratis_shell.md b/docs/celeborn_ratis_shell.md
index 0ee0971aa..498b55f2d 100644
--- a/docs/celeborn_ratis_shell.md
+++ b/docs/celeborn_ratis_shell.md
@@ -58,12 +58,12 @@ The following command can be invoked in order to get the
basic usage:
```shell
$ celeborn-ratis sh
-Usage: celeborn-ratis sh [generic options]
- [election [transfer] [stepDown] [pause] [resume]]
- [group [info] [list]]
- [peer [add] [remove] [setPriority]]
- [snapshot [create]]
- [local [raftMetaConf]]
+Usage: ratis sh [generic options]
+ [election [transfer] [stepDown] [pause] [resume]]
+ [group [info] [list]]
+ [local [raftMetaConf]]
+ [peer [add] [remove] [setPriority]]
+ [snapshot [create]]
```
## generic options
@@ -87,26 +87,26 @@ It has the following subcommands:
### election transfer
Transfer a group leader to the specified server.
```
-$ celeborn-ratis sh election transfer -peers
<P0_HOST:P0_PORT,P1_HOST:P1_PORT,P2_HOST:P2_PORT> -address <HOSTNAME:PORT>
[-groupid <RAFT_GROUP_ID>]
+$ celeborn-ratis sh election transfer -address <HOSTNAME:PORT> -peers
<PEER0_HOST:PEER0_PORT,PEER1_HOST:PEER1_PORT,PEER2_HOST:PEER2_PORT> [-groupid
<RAFT_GROUP_ID>] [-timeout <TIMEOUT_IN_SECONDS>]
```
### election stepDown
Make a group leader of the given group step down its leadership.
```
-$ celeborn-ratis sh election stepDown -peers
<P0_HOST:P0_PORT,P1_HOST:P1_PORT,P2_HOST:P2_PORT> [-groupid <RAFT_GROUP_ID>]
+$ celeborn-ratis sh election stepDown -peers
<PEER0_HOST:PEER0_PORT,PEER1_HOST:PEER1_PORT,PEER2_HOST:PEER2_PORT> [-groupid
<RAFT_GROUP_ID>]
```
### election pause
Pause leader election at the specified server.
Then, the specified server would not start a leader election.
```
-$ celeborn-ratis sh election pause -peers
<P0_HOST:P0_PORT,P1_HOST:P1_PORT,P2_HOST:P2_PORT> -address <HOSTNAME:PORT>
[-groupid <RAFT_GROUP_ID>]
+$ celeborn-ratis sh election pause -address <HOSTNAME:PORT> -peers
<PEER0_HOST:PEER0_PORT,PEER1_HOST:PEER1_PORT,PEER2_HOST:PEER2_PORT> [-groupid
<RAFT_GROUP_ID>]
```
### election resume
Resume leader election at the specified server.
```
-$ celeborn-ratis sh election resume -peers
<P0_HOST:P0_PORT,P1_HOST:P1_PORT,P2_HOST:P2_PORT> -address <HOSTNAME:PORT>
[-groupid <RAFT_GROUP_ID>]
+$ celeborn-ratis sh election resume -address <HOSTNAME:PORT> -peers
<PEER0_HOST:PEER0_PORT,PEER1_HOST:PEER1_PORT,PEER2_HOST:PEER2_PORT> [-groupid
<RAFT_GROUP_ID>]
```
## group
@@ -117,13 +117,13 @@ It has the following subcommands:
### group info
Display the information of a specific raft group.
```
-$ celeborn-ratis sh group info -peers
<P0_HOST:P0_PORT,P1_HOST:P1_PORT,P2_HOST:P2_PORT> [-groupid <RAFT_GROUP_ID>]
+$ celeborn-ratis sh group info -peers
<PEER0_HOST:PEER0_PORT,PEER1_HOST:PEER1_PORT,PEER2_HOST:PEER2_PORT> [-groupid
<RAFT_GROUP_ID>]
```
### group list
Display the group information of a specific raft server
```
-$ celeborn-ratis sh group list -peers
<P0_HOST:P0_PORT,P1_HOST:P1_PORT,P2_HOST:P2_PORT> [-groupid <RAFT_GROUP_ID>]
<[-serverAddress <P0_HOST:P0_PORT>]|[-peerId <peerId0>]>
+$ celeborn-ratis sh group list -peers
<PEER0_HOST:PEER0_PORT,PEER1_HOST:PEER1_PORT,PEER2_HOST:PEER2_PORT> [-groupid
<RAFT_GROUP_ID>] <[-serverAddress <PEER0_HOST:PEER0_PORT>]|[-peerId <peerId>]>
```
## peer
@@ -134,20 +134,20 @@ It has the following subcommands:
### peer add
Add peers to a ratis group.
```
-$ celeborn-ratis sh peer add -peers
<P0_HOST:P0_PORT,P1_HOST:P1_PORT,P2_HOST:P2_PORT> [-groupid <RAFT_GROUP_ID>]
-address <P4_HOST:P4_PORT,...,PN_HOST:PN_PORT>
+$ celeborn-ratis sh peer add -peers
<PEER0_HOST:PEER0_PORT,PEER1_HOST:PEER1_PORT,PEER2_HOST:PEER2_PORT> [-groupid
<RAFT_GROUP_ID>] <[-address <PEER0_HOST:PEER0_PORT>]|[-peerId <peerId>]>
[-clientAddress <CLIENT_ADDRESS1,CLIENT_ADDRESS2,...>] [-adminAddress
<ADMIN_ADDRESS1,ADMIN_ADDRESS2,...>]
```
### peer remove
Remove peers to from a ratis group.
```
-$ celeborn-ratis sh peer remove -peers
<P0_HOST:P0_PORT,P1_HOST:P1_PORT,P2_HOST:P2_PORT> [-groupid <RAFT_GROUP_ID>]
-address <P0_HOST:P0_PORT,...>
+$ celeborn-ratis sh peer remove -peers
<PEER0_HOST:PEER0_PORT,PEER1_HOST:PEER1_PORT,PEER2_HOST:PEER2_PORT> [-groupid
<RAFT_GROUP_ID>] <[-address <PEER0_HOST:PEER0_PORT>]|[-peerId <peerId>]>
```
### peer setPriority
Set priority to ratis peers.
The priority of ratis peer can affect the leader election, the server with the
highest priority will eventually become the leader of the cluster.
```
-$ celeborn-ratis sh peer setPriority -peers
<P0_HOST:P0_PORT,P1_HOST:P1_PORT,P2_HOST:P2_PORT> [-groupid <RAFT_GROUP_ID>]
-addressPriority <P0_HOST:P0_PORT|PRIORITY>
+$ celeborn-ratis sh peer setPriority -peers
<PEER0_HOST:PEER0_PORT,PEER1_HOST:PEER1_PORT,PEER2_HOST:PEER2_PORT> [-groupid
<RAFT_GROUP_ID>] -addressPriority <PEER_HOST:PEER_PORT|PRIORITY>
```
## snapshot
The `snapshot` command manages ratis snapshot.
@@ -157,7 +157,7 @@ It has the following subcommands:
### snapshot create
Trigger the specified server take snapshot.
```
-$ celeborn-ratis sh snapshot create -peers
<P0_HOST:P0_PORT,P1_HOST:P1_PORT,P2_HOST:P2_PORT> -peerId <peerId0> [-groupid
<RAFT_GROUP_ID>]
+$ celeborn-ratis sh snapshot create -peers
<PEER0_HOST:PEER0_PORT,PEER1_HOST:PEER1_PORT,PEER2_HOST:PEER2_PORT> [-groupid
<RAFT_GROUP_ID>] [-snapshotTimeout <timeoutInMs>] [-peerId <raftPeerId>]
```
## local
diff --git a/pom.xml b/pom.xml
index 5bf67c3ba..c17f70c0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
<netty.version>4.2.10.Final</netty.version>
<bouncycastle.version>1.77</bouncycastle.version>
<protobuf.version>3.25.5</protobuf.version>
- <ratis.version>3.1.3</ratis.version>
+ <ratis.version>3.2.1</ratis.version>
<scalatest.version>3.2.16</scalatest.version>
<slf4j.version>1.7.36</slf4j.version>
<roaringbitmap.version>1.0.6</roaringbitmap.version>
diff --git a/project/CelebornBuild.scala b/project/CelebornBuild.scala
index 45b525f2f..5eed99615 100644
--- a/project/CelebornBuild.scala
+++ b/project/CelebornBuild.scala
@@ -63,7 +63,7 @@ object Dependencies {
val metricsVersion = "4.2.25"
val mockitoVersion = "4.11.0"
val nettyVersion = "4.2.10.Final"
- val ratisVersion = "3.1.3"
+ val ratisVersion = "3.2.1"
val roaringBitmapVersion = "1.0.6"
val rocksdbJniVersion = "9.10.0"
val jacksonVersion = "2.15.3"
