This is an automated email from the ASF dual-hosted git repository.

ethanfeng 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 7d1da5e91 [CELEBORN-1702] Bump Ratis version from 3.1.1 to 3.1.2
7d1da5e91 is described below

commit 7d1da5e915ffbfce6e64f0c9c0c040962dd02112
Author: SteNicholas <[email protected]>
AuthorDate: Mon Nov 11 17:15:20 2024 +0800

    [CELEBORN-1702] Bump Ratis version from 3.1.1 to 3.1.2
    
    ### What changes were proposed in this pull request?
    
    Bump Ratis version from 3.1.1 to 3.1.2 including:
    
    - Fix NPE in `RaftServerImpl.getLogInfo`: 
https://github.com/apache/ratis/pull/1171
    
    ### Why are the changes needed?
    
    Bump Ratis version from 3.1.1 to 3.1.2. Ratis has released v3.1.2, of which 
release note refers to [3.1.2](https://ratis.apache.org/post/3.1.2.html). The 
3.1.2 version is a minor release with multiple improvements and bugfixes 
including [[RATIS-2179] Fix NPE in 
`RaftServerImpl.getLogInfo`](https://issues.apache.org/jira/browse/RATIS-2179). 
See the [changes between 3.1.1 and 
3.1.2](https://github.com/apache/ratis/compare/ratis-3.1.1...ratis-3.1.2) 
releases.
    
    The 3.1.2 version fixed the following `NullPointerException` in CI log:
    
    ```
    [info] Test 
org.apache.celeborn.service.deploy.master.clustermeta.ha.MasterRatisServerSuiteJ.testIsLeader
 started
    24/10/24 08:16:30,295 ERROR [pool-1-thread-1] HARaftServer: Failed to 
retrieve RaftPeerRole. Setting cached role to UNRECOGNIZED and resetting leader 
info.
    java.io.IOException: java.lang.NullPointerException
        at org.apache.ratis.util.IOUtils.asIOException(IOUtils.java:56)
        at 
org.apache.ratis.server.impl.RaftServerImpl.waitForReply(RaftServerImpl.java:1148)
        at 
org.apache.ratis.server.impl.RaftServerProxy.getGroupInfo(RaftServerProxy.java:607)
        at 
org.apache.celeborn.service.deploy.master.clustermeta.ha.HARaftServer.getGroupInfo(HARaftServer.java:599)
        at 
org.apache.celeborn.service.deploy.master.clustermeta.ha.HARaftServer.updateServerRole(HARaftServer.java:514)
        at 
org.apache.celeborn.service.deploy.master.clustermeta.ha.HARaftServer.isLeader(HARaftServer.java:489)
        at 
org.apache.celeborn.service.deploy.master.clustermeta.ha.MasterRatisServerSuiteJ.testIsLeader(MasterRatisServerSuiteJ.java:47)
        at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
        at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
        at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
        at java.lang.reflect.Method.invoke(Method.java:498)
        at 
org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59)
        at 
org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
        at 
org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56)
        at 
org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
        at 
org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
        at 
org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
        at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
        at 
org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)
        at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)
        at 
org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)
        at 
org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)
        at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
        at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
        at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
        at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
        at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
        at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
        at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
        at org.junit.runners.Suite.runChild(Suite.java:128)
        at org.junit.runners.Suite.runChild(Suite.java:27)
        at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
        at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
        at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
        at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
        at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
        at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
        at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
        at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
        at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
        at com.novocode.junit.JUnitTask.execute(JUnitTask.java:64)
        at sbt.ForkMain$Run.lambda$runTest$1(ForkMain.java:414)
        at java.util.concurrent.FutureTask.run(FutureTask.java:266)
        at 
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
        at 
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
        at java.lang.Thread.run(Thread.java:750)
    Caused by: java.lang.NullPointerException
        at 
org.apache.ratis.server.impl.RaftServerImpl.getLogInfo(RaftServerImpl.java:665)
        at 
org.apache.ratis.server.impl.RaftServerImpl.getGroupInfo(RaftServerImpl.java:658)
        at 
org.apache.ratis.server.impl.RaftServerProxy.lambda$getGroupInfoAsync$23(RaftServerProxy.java:613)
        at 
java.util.concurrent.CompletableFuture.uniApply(CompletableFuture.java:616)
        at 
java.util.concurrent.CompletableFuture$UniApply.tryFire(CompletableFuture.java:591)
        at 
java.util.concurrent.CompletableFuture$Completion.exec(CompletableFuture.java:457)
        at java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:289)
        at 
java.util.concurrent.ForkJoinPool$WorkQueue.runTask(ForkJoinPool.java:1056)
        at java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1692)
        at 
java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:175)
    ```
    
    ### Does this PR introduce _any_ user-facing change?
    
    No.
    
    ### How was this patch tested?
    
    CI.
    
    Closes #2897 from SteNicholas/CELEBORN-1702.
    
    Authored-by: SteNicholas <[email protected]>
    Signed-off-by: mingji <[email protected]>
---
 dev/deps/dependencies-server | 20 ++++++++++----------
 pom.xml                      |  2 +-
 project/CelebornBuild.scala  |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dev/deps/dependencies-server b/dev/deps/dependencies-server
index f55a75385..74e71214a 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.25.5//protobuf-java-3.25.5.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-client/3.1.2//ratis-client-3.1.2.jar
+ratis-common/3.1.2//ratis-common-3.1.2.jar
+ratis-grpc/3.1.2//ratis-grpc-3.1.2.jar
+ratis-metrics-api/3.1.2//ratis-metrics-api-3.1.2.jar
+ratis-metrics-default/3.1.2//ratis-metrics-default-3.1.2.jar
+ratis-netty/3.1.2//ratis-netty-3.1.2.jar
+ratis-proto/3.1.2//ratis-proto-3.1.2.jar
+ratis-server-api/3.1.2//ratis-server-api-3.1.2.jar
+ratis-server/3.1.2//ratis-server-3.1.2.jar
+ratis-shell/3.1.2//ratis-shell-3.1.2.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/pom.xml b/pom.xml
index 813ea4655..1da158f70 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.25.5</protobuf.version>
-    <ratis.version>3.1.1</ratis.version>
+    <ratis.version>3.1.2</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 7c4613c4d..561afc9ac 100644
--- a/project/CelebornBuild.scala
+++ b/project/CelebornBuild.scala
@@ -60,7 +60,7 @@ object Dependencies {
   val metricsVersion = "4.2.25"
   val mockitoVersion = "4.11.0"
   val nettyVersion = "4.1.109.Final"
-  val ratisVersion = "3.1.1"
+  val ratisVersion = "3.1.2"
   val roaringBitmapVersion = "1.0.6"
   val rocksdbJniVersion = "9.5.2"
   val jacksonVersion = "2.15.3"

Reply via email to