Skip to content

Commit 4ac7ef8

Browse files
committed
[CELEBORN-1400] Bump Ratis version from 2.5.1 to 3.0.1
1 parent 08efbb8 commit 4ac7ef8

19 files changed

+91
-64
lines changed

common/src/main/scala/org/apache/celeborn/common/CelebornConf.scala

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -745,6 +745,7 @@ class CelebornConf(loadDefaults: Boolean) extends Cloneable with Logging with Se
745745
def haMasterRatisStorageDir: String = get(HA_MASTER_RATIS_STORAGE_DIR)
746746
def haMasterRatisLogSegmentSizeMax: Long = get(HA_MASTER_RATIS_LOG_SEGMENT_SIZE_MAX)
747747
def haMasterRatisLogPreallocatedSize: Long = get(HA_MASTER_RATIS_LOG_PREALLOCATED_SIZE)
748+
def haMasterRatisLogWriteBufferSize: Long = get(HA_MASTER_RATIS_LOG_WRITE_BUFFER_SIZE)
748749
def haMasterRatisLogAppenderQueueNumElements: Int =
749750
get(HA_MASTER_RATIS_LOG_APPENDER_QUEUE_NUM_ELEMENTS)
750751
def haMasterRatisLogAppenderQueueBytesLimit: Long =
@@ -2260,6 +2261,14 @@ object CelebornConf extends Logging {
22602261
.bytesConf(ByteUnit.BYTE)
22612262
.createWithDefaultString("4MB")
22622263

2264+
val HA_MASTER_RATIS_LOG_WRITE_BUFFER_SIZE: ConfigEntry[Long] =
2265+
buildConf("celeborn.master.ha.ratis.raft.server.log.write.buffer.size")
2266+
.internal
2267+
.categories("ha")
2268+
.version("0.5.0")
2269+
.bytesConf(ByteUnit.BYTE)
2270+
.createWithDefaultString("64MB")
2271+
22632272
val HA_MASTER_RATIS_LOG_APPENDER_QUEUE_NUM_ELEMENTS: ConfigEntry[Int] =
22642273
buildConf("celeborn.master.ha.ratis.raft.server.log.appender.buffer.element-limit")
22652274
.withAlternative("celeborn.ha.master.ratis.raft.server.log.appender.buffer.element-limit")

dev/deps/dependencies-client-flink-1.14

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar
7373
netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
7474
paranamer/2.8//paranamer-2.8.jar
7575
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
76-
ratis-client/2.5.1//ratis-client-2.5.1.jar
77-
ratis-common/2.5.1//ratis-common-2.5.1.jar
78-
ratis-proto/2.5.1//ratis-proto-2.5.1.jar
79-
ratis-thirdparty-misc/1.0.4//ratis-thirdparty-misc-1.0.4.jar
76+
ratis-client/3.0.1//ratis-client-3.0.1.jar
77+
ratis-common/3.0.1//ratis-common-3.0.1.jar
78+
ratis-proto/3.0.1//ratis-proto-3.0.1.jar
79+
ratis-thirdparty-misc/1.0.5//ratis-thirdparty-misc-1.0.5.jar
8080
scala-library/2.12.18//scala-library-2.12.18.jar
8181
scala-reflect/2.12.18//scala-reflect-2.12.18.jar
8282
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

dev/deps/dependencies-client-flink-1.15

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar
7373
netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
7474
paranamer/2.8//paranamer-2.8.jar
7575
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
76-
ratis-client/2.5.1//ratis-client-2.5.1.jar
77-
ratis-common/2.5.1//ratis-common-2.5.1.jar
78-
ratis-proto/2.5.1//ratis-proto-2.5.1.jar
79-
ratis-thirdparty-misc/1.0.4//ratis-thirdparty-misc-1.0.4.jar
76+
ratis-client/3.0.1//ratis-client-3.0.1.jar
77+
ratis-common/3.0.1//ratis-common-3.0.1.jar
78+
ratis-proto/3.0.1//ratis-proto-3.0.1.jar
79+
ratis-thirdparty-misc/1.0.5//ratis-thirdparty-misc-1.0.5.jar
8080
scala-library/2.12.18//scala-library-2.12.18.jar
8181
scala-reflect/2.12.18//scala-reflect-2.12.18.jar
8282
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

dev/deps/dependencies-client-flink-1.17

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar
7373
netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
7474
paranamer/2.8//paranamer-2.8.jar
7575
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
76-
ratis-client/2.5.1//ratis-client-2.5.1.jar
77-
ratis-common/2.5.1//ratis-common-2.5.1.jar
78-
ratis-proto/2.5.1//ratis-proto-2.5.1.jar
79-
ratis-thirdparty-misc/1.0.4//ratis-thirdparty-misc-1.0.4.jar
76+
ratis-client/3.0.1//ratis-client-3.0.1.jar
77+
ratis-common/3.0.1//ratis-common-3.0.1.jar
78+
ratis-proto/3.0.1//ratis-proto-3.0.1.jar
79+
ratis-thirdparty-misc/1.0.5//ratis-thirdparty-misc-1.0.5.jar
8080
scala-library/2.12.18//scala-library-2.12.18.jar
8181
scala-reflect/2.12.18//scala-reflect-2.12.18.jar
8282
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

dev/deps/dependencies-client-flink-1.18

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar
7373
netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
7474
paranamer/2.8//paranamer-2.8.jar
7575
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
76-
ratis-client/2.5.1//ratis-client-2.5.1.jar
77-
ratis-common/2.5.1//ratis-common-2.5.1.jar
78-
ratis-proto/2.5.1//ratis-proto-2.5.1.jar
79-
ratis-thirdparty-misc/1.0.4//ratis-thirdparty-misc-1.0.4.jar
76+
ratis-client/3.0.1//ratis-client-3.0.1.jar
77+
ratis-common/3.0.1//ratis-common-3.0.1.jar
78+
ratis-proto/3.0.1//ratis-proto-3.0.1.jar
79+
ratis-thirdparty-misc/1.0.5//ratis-thirdparty-misc-1.0.5.jar
8080
scala-library/2.12.18//scala-library-2.12.18.jar
8181
scala-reflect/2.12.18//scala-reflect-2.12.18.jar
8282
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

dev/deps/dependencies-client-flink-1.19

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar
7373
netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
7474
paranamer/2.8//paranamer-2.8.jar
7575
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
76-
ratis-client/2.5.1//ratis-client-2.5.1.jar
77-
ratis-common/2.5.1//ratis-common-2.5.1.jar
78-
ratis-proto/2.5.1//ratis-proto-2.5.1.jar
79-
ratis-thirdparty-misc/1.0.4//ratis-thirdparty-misc-1.0.4.jar
76+
ratis-client/3.0.1//ratis-client-3.0.1.jar
77+
ratis-common/3.0.1//ratis-common-3.0.1.jar
78+
ratis-proto/3.0.1//ratis-proto-3.0.1.jar
79+
ratis-thirdparty-misc/1.0.5//ratis-thirdparty-misc-1.0.5.jar
8080
scala-library/2.12.18//scala-library-2.12.18.jar
8181
scala-reflect/2.12.18//scala-reflect-2.12.18.jar
8282
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

dev/deps/dependencies-client-mr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ okhttp/4.9.3//okhttp-4.9.3.jar
180180
okio/2.8.0//okio-2.8.0.jar
181181
paranamer/2.8//paranamer-2.8.jar
182182
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
183-
ratis-client/2.5.1//ratis-client-2.5.1.jar
184-
ratis-common/2.5.1//ratis-common-2.5.1.jar
185-
ratis-proto/2.5.1//ratis-proto-2.5.1.jar
186-
ratis-thirdparty-misc/1.0.4//ratis-thirdparty-misc-1.0.4.jar
183+
ratis-client/3.0.1//ratis-client-3.0.1.jar
184+
ratis-common/3.0.1//ratis-common-3.0.1.jar
185+
ratis-proto/3.0.1//ratis-proto-3.0.1.jar
186+
ratis-thirdparty-misc/1.0.5//ratis-thirdparty-misc-1.0.5.jar
187187
re2j/1.1//re2j-1.1.jar
188188
reload4j/1.2.22//reload4j-1.2.22.jar
189189
scala-library/2.12.18//scala-library-2.12.18.jar

dev/deps/dependencies-client-spark-2.4

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar
7373
netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
7474
paranamer/2.8//paranamer-2.8.jar
7575
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
76-
ratis-client/2.5.1//ratis-client-2.5.1.jar
77-
ratis-common/2.5.1//ratis-common-2.5.1.jar
78-
ratis-proto/2.5.1//ratis-proto-2.5.1.jar
79-
ratis-thirdparty-misc/1.0.4//ratis-thirdparty-misc-1.0.4.jar
76+
ratis-client/3.0.1//ratis-client-3.0.1.jar
77+
ratis-common/3.0.1//ratis-common-3.0.1.jar
78+
ratis-proto/3.0.1//ratis-proto-3.0.1.jar
79+
ratis-thirdparty-misc/1.0.5//ratis-thirdparty-misc-1.0.5.jar
8080
scala-library/2.11.12//scala-library-2.11.12.jar
8181
scala-reflect/2.11.12//scala-reflect-2.11.12.jar
8282
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

dev/deps/dependencies-client-spark-3.0

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar
7373
netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
7474
paranamer/2.8//paranamer-2.8.jar
7575
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
76-
ratis-client/2.5.1//ratis-client-2.5.1.jar
77-
ratis-common/2.5.1//ratis-common-2.5.1.jar
78-
ratis-proto/2.5.1//ratis-proto-2.5.1.jar
79-
ratis-thirdparty-misc/1.0.4//ratis-thirdparty-misc-1.0.4.jar
76+
ratis-client/3.0.1//ratis-client-3.0.1.jar
77+
ratis-common/3.0.1//ratis-common-3.0.1.jar
78+
ratis-proto/3.0.1//ratis-proto-3.0.1.jar
79+
ratis-thirdparty-misc/1.0.5//ratis-thirdparty-misc-1.0.5.jar
8080
scala-library/2.12.10//scala-library-2.12.10.jar
8181
scala-reflect/2.12.10//scala-reflect-2.12.10.jar
8282
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

dev/deps/dependencies-client-spark-3.1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar
7373
netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
7474
paranamer/2.8//paranamer-2.8.jar
7575
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
76-
ratis-client/2.5.1//ratis-client-2.5.1.jar
77-
ratis-common/2.5.1//ratis-common-2.5.1.jar
78-
ratis-proto/2.5.1//ratis-proto-2.5.1.jar
79-
ratis-thirdparty-misc/1.0.4//ratis-thirdparty-misc-1.0.4.jar
76+
ratis-client/3.0.1//ratis-client-3.0.1.jar
77+
ratis-common/3.0.1//ratis-common-3.0.1.jar
78+
ratis-proto/3.0.1//ratis-proto-3.0.1.jar
79+
ratis-thirdparty-misc/1.0.5//ratis-thirdparty-misc-1.0.5.jar
8080
scala-library/2.12.10//scala-library-2.12.10.jar
8181
scala-reflect/2.12.10//scala-reflect-2.12.10.jar
8282
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

0 commit comments

Comments
 (0)