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 1f1e988162cf..d9c410c107f1 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.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.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 @@ 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 void testLeaderIdUsedOnFirstCall() throws Exception { // 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 8389de72734c..031b5e289383 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 ${ozone.version} - 2.3.0-94db58b-SNAPSHOT + 2.3.0-da5d868-SNAPSHOT 0.7.0