This is an automated email from the ASF dual-hosted git repository. szetszwo pushed a commit to branch HDDS-4454 in repository https://gitbox.apache.org/repos/asf/ozone.git
commit b9d36ba86c605d3700c42869d8a5ab3991935cfa Author: Tsz-Wo Nicholas Sze <[email protected]> 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 0cb3e65..6a0a615 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 @@ -34,9 +34,6 @@ import org.apache.ozone.test.GenericTestUtils; import org.apache.ozone.test.tag.Flaky; 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; @@ -46,7 +43,9 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.slf4j.event.Level; /** * Test pipeline leader information is correctly used. @@ -55,7 +54,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); @BeforeAll @@ -97,9 +96,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 33df1a3..7522039 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,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: [email protected] For additional commands, e-mail: [email protected]
