From c69faa6dd251c961c062aade4a0d262fc17a9a70 Mon Sep 17 00:00:00 2001
From: SteNicholas <programgeek@163.com>
Date: Mon, 23 Sep 2024 21:17:37 +0800
Subject: [PATCH] [CELEBORN-1525] Bump Ratis version from 3.1.0 to 3.1.1

---
 dev/deps/dependencies-server                  | 20 +++++++++----------
 .../master/clustermeta/ha/HARaftServer.java   |  4 +---
 pom.xml                                       |  2 +-
 project/CelebornBuild.scala                   |  2 +-
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/dev/deps/dependencies-server b/dev/deps/dependencies-server
index 61413d4c10a..24b85818207 100644
--- a/dev/deps/dependencies-server
+++ b/dev/deps/dependencies-server
@@ -122,16 +122,16 @@ 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.21.7//protobuf-java-3.21.7.jar
-ratis-client/3.1.0//ratis-client-3.1.0.jar
-ratis-common/3.1.0//ratis-common-3.1.0.jar
-ratis-grpc/3.1.0//ratis-grpc-3.1.0.jar
-ratis-metrics-api/3.1.0//ratis-metrics-api-3.1.0.jar
-ratis-metrics-default/3.1.0//ratis-metrics-default-3.1.0.jar
-ratis-netty/3.1.0//ratis-netty-3.1.0.jar
-ratis-proto/3.1.0//ratis-proto-3.1.0.jar
-ratis-server-api/3.1.0//ratis-server-api-3.1.0.jar
-ratis-server/3.1.0//ratis-server-3.1.0.jar
-ratis-shell/3.1.0//ratis-shell-3.1.0.jar
+ratis-client/3.1.1//ratis-client-3.1.1.jar
+ratis-common/3.1.1//ratis-common-3.1.1.jar
+ratis-grpc/3.1.1//ratis-grpc-3.1.1.jar
+ratis-metrics-api/3.1.1//ratis-metrics-api-3.1.1.jar
+ratis-metrics-default/3.1.1//ratis-metrics-default-3.1.1.jar
+ratis-netty/3.1.1//ratis-netty-3.1.1.jar
+ratis-proto/3.1.1//ratis-proto-3.1.1.jar
+ratis-server-api/3.1.1//ratis-server-api-3.1.1.jar
+ratis-server/3.1.1//ratis-server-3.1.1.jar
+ratis-shell/3.1.1//ratis-shell-3.1.1.jar
 ratis-thirdparty-misc/1.0.6//ratis-thirdparty-misc-1.0.6.jar
 rocksdbjni/9.5.2//rocksdbjni-9.5.2.jar
 scala-library/2.12.18//scala-library-2.12.18.jar
diff --git a/master/src/main/java/org/apache/celeborn/service/deploy/master/clustermeta/ha/HARaftServer.java b/master/src/main/java/org/apache/celeborn/service/deploy/master/clustermeta/ha/HARaftServer.java
index d9141f03405..b26702adc63 100644
--- a/master/src/main/java/org/apache/celeborn/service/deploy/master/clustermeta/ha/HARaftServer.java
+++ b/master/src/main/java/org/apache/celeborn/service/deploy/master/clustermeta/ha/HARaftServer.java
@@ -200,9 +200,7 @@ public static HARaftServer newMasterRatisServer(
     RaftPeer localRaftPeer =
         RaftPeer.newBuilder()
             .setId(localRaftPeerId)
-            // TODO(CELEBORN-1525): Once Ratis 3.2.0 is released and we move to it, we
-            // should remove address2String and change this to .setAddress(ratisAddr)
-            .setAddress(address2String(ratisAddr))
+            .setAddress(ratisAddr)
             .setClientAddress(localNode.rpcEndpoint())
             // We use admin address to host the internal rpc address
             .setAdminAddress(localNode.internalRpcEndpoint())
diff --git a/pom.xml b/pom.xml
index ab06cb6a577..1a90f2921da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,7 @@
     <netty.version>4.1.109.Final</netty.version>
     <bouncycastle.version>1.77</bouncycastle.version>
     <protobuf.version>3.21.7</protobuf.version>
-    <ratis.version>3.1.0</ratis.version>
+    <ratis.version>3.1.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 1c18aab0d29..f6ab60cc256 100644
--- a/project/CelebornBuild.scala
+++ b/project/CelebornBuild.scala
@@ -59,7 +59,7 @@ object Dependencies {
   val metricsVersion = "4.2.25"
   val mockitoVersion = "4.11.0"
   val nettyVersion = "4.1.109.Final"
-  val ratisVersion = "3.1.0"
+  val ratisVersion = "3.1.1"
   val roaringBitmapVersion = "1.0.6"
   val rocksdbJniVersion = "9.5.2"
   val jacksonVersion = "2.15.3"