This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 906062ef325 HDDS-16196. Bump Apache Ratis to 3.3.1 (#11032)
906062ef325 is described below
commit 906062ef3254699c9fc5895c67f377bab165f339
Author: Rui Wang <[email protected]>
AuthorDate: Tue Sep 22 02:27:30 2026 +0800
HDDS-16196. Bump Apache Ratis to 3.3.1 (#11032)
---
.../test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java | 8 ++++----
.../hadoop/ozone/om/TestOzoneManagerHAWithStoppedNodes.java | 4 ++++
pom.xml | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java
index 9f86be490e2..6f90a54835f 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java
@@ -52,7 +52,7 @@
import
org.apache.hadoop.ozone.container.common.statemachine.EndpointStateMachine;
import org.apache.hadoop.ozone.container.common.volume.StorageVolume;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
@@ -64,10 +64,10 @@
public class TestMiniOzoneCluster {
private MiniOzoneCluster cluster;
- private static OzoneConfiguration conf;
+ private OzoneConfiguration conf;
- @BeforeAll
- static void setup(@TempDir File testDir) {
+ @BeforeEach
+ void setup(@TempDir File testDir) {
conf = new OzoneConfiguration();
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
conf.setInt(ScmConfigKeys.OZONE_DATANODE_PIPELINE_LIMIT, 1);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithStoppedNodes.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithStoppedNodes.java
index 014e4dc06f6..63556c80eba 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithStoppedNodes.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithStoppedNodes.java
@@ -335,6 +335,10 @@ void testOMRestart() throws Exception {
createKey(ozoneBucket);
}
+ GenericTestUtils.waitFor(() -> followerOM1.getOmRatisServer()
+ .getLastAppliedTermIndex().getIndex() > leaderOMSnaphsotIndex,
+ 100, 200000);
+
final long followerOM1LastAppliedIndexNew =
followerOM1.getOmRatisServer().getLastAppliedTermIndex().getIndex();
assertThat(followerOM1LastAppliedIndexNew).isGreaterThan(leaderOMSnaphsotIndex);
diff --git a/pom.xml b/pom.xml
index 41373368769..cec66c0e59b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -192,7 +192,7 @@
<ratis-thirdparty.netty.version>4.1.136.Final</ratis-thirdparty.netty.version>
<ratis-thirdparty.protobuf.version>3.25.9</ratis-thirdparty.protobuf.version>
<ratis.thirdparty.version>1.1.0</ratis.thirdparty.version>
- <ratis.version>3.2.1</ratis.version>
+ <ratis.version>3.3.1</ratis.version>
<re2j.version>1.7</re2j.version>
<reflections.version>0.10.2</reflections.version>
<reload4j.version>1.2.26</reload4j.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
