You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ca...@apache.org on 2022/03/17 02:23:50 UTC
[ozone] branch HDDS-4454 updated: HDDS-6461. Update Ratis version to 2.3.0-da5d868-SNAPSHOT. (#3205)
This is an automated email from the ASF dual-hosted git repository.
captainzmc pushed a commit to branch HDDS-4454
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/HDDS-4454 by this push:
new eaef7ea HDDS-6461. Update Ratis version to 2.3.0-da5d868-SNAPSHOT. (#3205)
eaef7ea is described below
commit eaef7eabc7df6e9e0ff0f7acefd4afcdc73918e3
Author: Tsz-Wo Nicholas Sze <sz...@apache.org>
AuthorDate: Thu Mar 17 10:20:55 2022 +0800
HDDS-6461. Update Ratis version to 2.3.0-da5d868-SNAPSHOT. (#3205)
---
.../org/apache/hadoop/hdds/scm/TestRatisPipelineLeader.java | 13 +++++++------
pom.xml | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestRatisPipelineLeader.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestRatisPipelineLeader.java
index 1f1e988..d9c410c 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestRatisPipelineLeader.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestRatisPipelineLeader.java
@@ -33,9 +33,6 @@ import org.apache.hadoop.ozone.container.common.transport.server.ratis.XceiverSe
import org.apache.ozone.test.GenericTestUtils;
import static org.apache.hadoop.ozone.OzoneConfigKeys.DFS_RATIS_LEADER_ELECTION_MINIMUM_TIMEOUT_DURATION_KEY;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.ratis.grpc.client.GrpcClientProtocolService;
import org.apache.ratis.protocol.ClientId;
import org.apache.ratis.protocol.GroupInfoReply;
import org.apache.ratis.protocol.GroupInfoRequest;
@@ -45,7 +42,9 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
+import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
/**
* Test pipeline leader information is correctly used.
@@ -54,7 +53,7 @@ import org.slf4j.LoggerFactory;
public class TestRatisPipelineLeader {
private static MiniOzoneCluster cluster;
private static OzoneConfiguration conf;
- private static final org.slf4j.Logger LOG =
+ private static final Logger LOG =
LoggerFactory.getLogger(TestRatisPipelineLeader.class);
@BeforeClass
@@ -96,9 +95,11 @@ public class TestRatisPipelineLeader {
// Verify client connects to Leader without NotLeaderException
XceiverClientRatis xceiverClientRatis =
XceiverClientRatis.newXceiverClientRatis(ratisPipeline, conf);
- Logger.getLogger(GrpcClientProtocolService.class).setLevel(Level.DEBUG);
+ final Logger log = LoggerFactory.getLogger(
+ "org.apache.ratis.grpc.server.GrpcClientProtocolService");
+ GenericTestUtils.setLogLevel(log, Level.DEBUG);
GenericTestUtils.LogCapturer logCapturer =
- GenericTestUtils.LogCapturer.captureLogs(GrpcClientProtocolService.LOG);
+ GenericTestUtils.LogCapturer.captureLogs(log);
xceiverClientRatis.connect();
ContainerProtocolCalls.createContainer(xceiverClientRatis, 1L, null);
logCapturer.stopCapturing();
diff --git a/pom.xml b/pom.xml
index 8389de7..031b5e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<declared.ozone.version>${ozone.version}</declared.ozone.version>
<!-- Apache Ratis version -->
- <ratis.version>2.3.0-94db58b-SNAPSHOT</ratis.version>
+ <ratis.version>2.3.0-da5d868-SNAPSHOT</ratis.version>
<!-- Apache Ratis thirdparty version -->
<ratis.thirdparty.version>0.7.0</ratis.thirdparty.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org