This is an automated email from the ASF dual-hosted git repository.
dragonyliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ratis.git
The following commit(s) were added to refs/heads/master by this push:
new 4a2a34c7b RATIS-1728. Avoid org.apache.log4j imports. (#768)
4a2a34c7b is described below
commit 4a2a34c7b1c2657ef178c1e137ad114dc2f18ff2
Author: Tsz-Wo Nicholas Sze <[email protected]>
AuthorDate: Thu Oct 27 20:49:18 2022 +0800
RATIS-1728. Avoid org.apache.log4j imports. (#768)
---
.../src/test/java/org/apache/ratis/BaseTest.java | 8 +--
.../util/{Log4jUtils.java => Slf4jUtils.java} | 23 +++++--
.../java/org/apache/ratis/TestMultiRaftGroup.java | 7 +-
.../ratis/examples/arithmetic/TestArithmetic.java | 6 +-
.../examples/arithmetic/TestArithmeticLogDump.java | 6 +-
.../ratis/InstallSnapshotNotificationTests.java | 6 +-
.../java/org/apache/ratis/LogAppenderTests.java | 6 +-
.../org/apache/ratis/MessageStreamApiTests.java | 8 +--
.../org/apache/ratis/RaftAsyncExceptionTests.java | 6 +-
.../test/java/org/apache/ratis/RaftAsyncTests.java | 8 +--
.../test/java/org/apache/ratis/RaftBasicTests.java | 6 +-
.../org/apache/ratis/RaftExceptionBaseTest.java | 10 +--
.../org/apache/ratis/ReadOnlyRequestTests.java | 6 +-
.../ratis/ReadOnlyRequestWithLongTimeoutTests.java | 6 +-
.../apache/ratis/RequestLimitAsyncBaseTest.java | 8 +--
.../java/org/apache/ratis/RetryCacheTests.java | 6 +-
.../java/org/apache/ratis/WatchRequestTests.java | 6 +-
.../ratis/server/impl/GroupInfoBaseTest.java | 8 +--
.../ratis/server/impl/GroupManagementBaseTest.java | 10 +--
.../ratis/server/impl/LeaderElectionTests.java | 8 +--
.../server/impl/PreAppendLeaderStepDownTest.java | 10 +--
.../server/impl/RaftReconfigurationBaseTest.java | 6 +-
.../ratis/server/impl/RaftServerTestUtil.java | 74 ++--------------------
.../impl/RaftStateMachineExceptionTests.java | 10 +--
.../server/impl/TestRatisServerMetricsBase.java | 8 +--
.../segmented/SegmentedRaftLogTestUtils.java | 6 +-
.../ratis/statemachine/RaftSnapshotBaseTest.java | 10 +--
.../ratis/statemachine/SnapshotManagementTest.java | 10 +--
.../ratis/TestRaftServerNoLeaderTimeout.java | 8 +--
.../ratis/TestRaftServerSlownessDetection.java | 6 +-
...amSslWithRpcTypeGrpcAndDataStreamTypeNetty.java | 6 +-
.../apache/ratis/grpc/TestLogAppenderWithGrpc.java | 6 +-
.../apache/ratis/grpc/TestRaftServerWithGrpc.java | 6 +-
.../ratis/grpc/TestWatchRequestWithGrpc.java | 10 +--
.../apache/ratis/server/ServerRestartTests.java | 6 +-
.../server/raftlog/memory/MemoryRaftLogTest.java | 6 +-
.../raftlog/segmented/TestSegmentedRaftLog.java | 10 +--
.../cli/sh/ElectionCommandIntegrationTest.java | 10 +--
.../shell/cli/sh/GroupCommandIntegrationTest.java | 10 +--
.../shell/cli/sh/PeerCommandIntegrationTest.java | 10 +--
.../cli/sh/SnapshotCommandIntegrationTest.java | 10 +--
.../ratis/statemachine/TestStateMachine.java | 8 +--
.../org/apache/ratis/util/TestTimeDuration.java | 4 +-
.../apache/ratis/util/TestTimeoutScheduler.java | 4 +-
44 files changed, 180 insertions(+), 232 deletions(-)
diff --git a/ratis-common/src/test/java/org/apache/ratis/BaseTest.java
b/ratis-common/src/test/java/org/apache/ratis/BaseTest.java
index 68c801508..b05387b7b 100644
--- a/ratis-common/src/test/java/org/apache/ratis/BaseTest.java
+++ b/ratis-common/src/test/java/org/apache/ratis/BaseTest.java
@@ -17,13 +17,12 @@
*/
package org.apache.ratis;
-import org.apache.log4j.Level;
import org.apache.ratis.conf.ConfUtils;
import org.apache.ratis.protocol.RaftPeer;
import org.apache.ratis.util.ExitUtils;
import org.apache.ratis.util.FileUtils;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.TimeDuration;
import org.apache.ratis.util.function.CheckedRunnable;
import org.junit.After;
@@ -33,6 +32,7 @@ import org.junit.rules.TestName;
import org.junit.rules.Timeout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
import java.io.File;
import java.io.IOException;
@@ -54,8 +54,8 @@ public abstract class BaseTest {
public static final TimeDuration FIVE_SECONDS = TimeDuration.valueOf(5,
TimeUnit.SECONDS);
{
- Log4jUtils.setLogLevel(ConfUtils.LOG, Level.WARN);
- Log4jUtils.setLogLevel(FileUtils.LOG, Level.TRACE);
+ Slf4jUtils.setLogLevel(ConfUtils.LOG, Level.WARN);
+ Slf4jUtils.setLogLevel(FileUtils.LOG, Level.TRACE);
ExitUtils.disableSystemExit();
}
diff --git a/ratis-common/src/test/java/org/apache/ratis/util/Log4jUtils.java
b/ratis-common/src/test/java/org/apache/ratis/util/Slf4jUtils.java
similarity index 65%
rename from ratis-common/src/test/java/org/apache/ratis/util/Log4jUtils.java
rename to ratis-common/src/test/java/org/apache/ratis/util/Slf4jUtils.java
index da5463065..dadbae352 100644
--- a/ratis-common/src/test/java/org/apache/ratis/util/Log4jUtils.java
+++ b/ratis-common/src/test/java/org/apache/ratis/util/Slf4jUtils.java
@@ -1,5 +1,3 @@
-package org.apache.ratis.util;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,12 +15,15 @@ package org.apache.ratis.util;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.ratis.util;
-import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
import org.slf4j.Logger;
+import org.slf4j.event.Level;
+
+import java.util.Optional;
-public interface Log4jUtils {
+public interface Slf4jUtils {
static void setLogLevel(Logger logger, Level level) {
final String name = logger.getName();
@@ -31,7 +32,19 @@ public interface Log4jUtils {
} else {
LogUtils.LOG.info("Set {} log level to {}", name, level);
}
- LogManager.getLogger(name).setLevel(level);
+
+ Optional.ofNullable(LogManager.getLogger(name))
+ .ifPresent(log -> log.setLevel(getLog4jLevel(level)));
}
+ static org.apache.log4j.Level getLog4jLevel(Level level) {
+ switch (level) {
+ case ERROR: return org.apache.log4j.Level.ERROR;
+ case WARN: return org.apache.log4j.Level.WARN;
+ case INFO: return org.apache.log4j.Level.INFO;
+ case DEBUG: return org.apache.log4j.Level.DEBUG;
+ case TRACE: return org.apache.log4j.Level.TRACE;
+ }
+ throw new IllegalArgumentException("Unexpected level " + level);
+ }
}
diff --git
a/ratis-examples/src/test/java/org/apache/ratis/TestMultiRaftGroup.java
b/ratis-examples/src/test/java/org/apache/ratis/TestMultiRaftGroup.java
index 4fb2066d7..49a910294 100644
--- a/ratis-examples/src/test/java/org/apache/ratis/TestMultiRaftGroup.java
+++ b/ratis-examples/src/test/java/org/apache/ratis/TestMultiRaftGroup.java
@@ -17,8 +17,6 @@
*/
package org.apache.ratis;
-
-import org.apache.log4j.Level;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.examples.ParameterizedBaseTest;
import org.apache.ratis.examples.arithmetic.ArithmeticStateMachine;
@@ -27,11 +25,12 @@ import org.apache.ratis.protocol.RaftGroup;
import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.impl.GroupManagementBaseTest;
import org.apache.ratis.server.impl.MiniRaftCluster;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.function.CheckedBiConsumer;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.slf4j.event.Level;
import java.io.IOException;
import java.util.Collection;
@@ -40,7 +39,7 @@ import java.util.concurrent.atomic.AtomicInteger;
@RunWith(Parameterized.class)
public class TestMultiRaftGroup extends BaseTest {
static {
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
}
@Parameterized.Parameters
diff --git
a/ratis-examples/src/test/java/org/apache/ratis/examples/arithmetic/TestArithmetic.java
b/ratis-examples/src/test/java/org/apache/ratis/examples/arithmetic/TestArithmetic.java
index e30ae32a2..0fa295c54 100644
---
a/ratis-examples/src/test/java/org/apache/ratis/examples/arithmetic/TestArithmetic.java
+++
b/ratis-examples/src/test/java/org/apache/ratis/examples/arithmetic/TestArithmetic.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis.examples.arithmetic;
-import org.apache.log4j.Level;
import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.examples.ParameterizedBaseTest;
@@ -26,11 +25,12 @@ import
org.apache.ratis.examples.arithmetic.expression.Expression;
import org.apache.ratis.examples.arithmetic.expression.NullValue;
import org.apache.ratis.examples.arithmetic.expression.Variable;
import org.apache.ratis.protocol.RaftClientReply;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.Preconditions;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runners.Parameterized;
+import org.slf4j.event.Level;
import java.io.IOException;
import java.util.Collection;
@@ -41,7 +41,7 @@ import static
org.apache.ratis.examples.arithmetic.expression.UnaryExpression.Op
public class TestArithmetic extends ParameterizedBaseTest {
{
- Log4jUtils.setLogLevel(ArithmeticStateMachine.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(ArithmeticStateMachine.LOG, Level.DEBUG);
}
@Parameterized.Parameters
diff --git
a/ratis-examples/src/test/java/org/apache/ratis/examples/arithmetic/TestArithmeticLogDump.java
b/ratis-examples/src/test/java/org/apache/ratis/examples/arithmetic/TestArithmeticLogDump.java
index 73ec91cac..564afaac2 100644
---
a/ratis-examples/src/test/java/org/apache/ratis/examples/arithmetic/TestArithmeticLogDump.java
+++
b/ratis-examples/src/test/java/org/apache/ratis/examples/arithmetic/TestArithmeticLogDump.java
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
@@ -33,16 +32,17 @@ import
org.apache.ratis.server.simulation.MiniRaftClusterWithSimulatedRpc;
import org.apache.ratis.statemachine.impl.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.tools.ParseRatisLog;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.TimeDuration;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.event.Level;
public class TestArithmeticLogDump extends BaseTest {
static {
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
}
public static final int NUM_SERVERS = 1;
diff --git
a/ratis-server/src/test/java/org/apache/ratis/InstallSnapshotNotificationTests.java
b/ratis-server/src/test/java/org/apache/ratis/InstallSnapshotNotificationTests.java
index cbaf6bff8..1efb21be7 100644
---
a/ratis-server/src/test/java/org/apache/ratis/InstallSnapshotNotificationTests.java
+++
b/ratis-server/src/test/java/org/apache/ratis/InstallSnapshotNotificationTests.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis;
-import org.apache.log4j.Level;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.proto.RaftProtos;
@@ -38,12 +37,13 @@ import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.statemachine.impl.SingleFileSnapshotInfo;
import org.apache.ratis.util.FileUtils;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.SizeInBytes;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
import java.io.File;
import java.io.IOException;
@@ -63,7 +63,7 @@ public abstract class
InstallSnapshotNotificationTests<CLUSTER extends MiniRaftC
static final Logger LOG =
LoggerFactory.getLogger(InstallSnapshotNotificationTests.class);
{
- Log4jUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
}
{
diff --git a/ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java
b/ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java
index ab4b891b3..ce08e4a74 100644
--- a/ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java
@@ -20,7 +20,6 @@ package org.apache.ratis;
import static org.apache.ratis.RaftTestUtil.waitForLeader;
import static org.junit.Assert.assertTrue;
-import org.apache.log4j.Level;
import org.apache.ratis.RaftTestUtil.SimpleMessage;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.conf.RaftProperties;
@@ -39,7 +38,7 @@ import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.statemachine.impl.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.SizeInBytes;
import org.junit.Assert;
import org.junit.Test;
@@ -56,12 +55,13 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.ratis.thirdparty.com.codahale.metrics.Gauge;
+import org.slf4j.event.Level;
public abstract class LogAppenderTests<CLUSTER extends MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(LogAppender.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(LogAppender.LOG, Level.DEBUG);
}
{
diff --git
a/ratis-server/src/test/java/org/apache/ratis/MessageStreamApiTests.java
b/ratis-server/src/test/java/org/apache/ratis/MessageStreamApiTests.java
index a0612708c..816611573 100644
--- a/ratis-server/src/test/java/org/apache/ratis/MessageStreamApiTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/MessageStreamApiTests.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis;
-import org.apache.log4j.Level;
import org.apache.ratis.RaftTestUtil.SimpleMessage;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.client.RaftClientConfigKeys;
@@ -30,18 +29,19 @@ import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.statemachine.impl.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.SizeInBytes;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.event.Level;
import java.nio.charset.StandardCharsets;
public abstract class MessageStreamApiTests<CLUSTER extends MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
- Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
public static final int NUM_SERVERS = 3;
diff --git
a/ratis-server/src/test/java/org/apache/ratis/RaftAsyncExceptionTests.java
b/ratis-server/src/test/java/org/apache/ratis/RaftAsyncExceptionTests.java
index 8c723b87f..1ad53a838 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RaftAsyncExceptionTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RaftAsyncExceptionTests.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis;
-import org.apache.log4j.Level;
import org.apache.ratis.RaftTestUtil.SimpleMessage;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.client.RaftClientConfigKeys;
@@ -30,9 +29,10 @@ import org.apache.ratis.protocol.RaftGroupId;
import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.statemachine.impl.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.event.Level;
import java.util.ArrayList;
import java.util.Iterator;
@@ -46,7 +46,7 @@ public abstract class RaftAsyncExceptionTests<CLUSTER extends
MiniRaftCluster>
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(OrderedAsync.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(OrderedAsync.LOG, Level.DEBUG);
getProperties().setClass(MiniRaftCluster.STATEMACHINE_CLASS_KEY,
SimpleStateMachine4Testing.class, StateMachine.class);
}
diff --git a/ratis-server/src/test/java/org/apache/ratis/RaftAsyncTests.java
b/ratis-server/src/test/java/org/apache/ratis/RaftAsyncTests.java
index d03327eb9..260f6013e 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RaftAsyncTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RaftAsyncTests.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis;
-import org.apache.log4j.Level;
import org.apache.ratis.RaftTestUtil.SimpleMessage;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.client.RaftClientConfigKeys;
@@ -47,11 +46,12 @@ import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
import
org.apache.ratis.thirdparty.com.google.protobuf.InvalidProtocolBufferException;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.TimeDuration;
import org.apache.ratis.util.function.CheckedRunnable;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.event.Level;
import java.io.IOException;
import java.util.ArrayList;
@@ -71,8 +71,8 @@ import static org.apache.ratis.RaftTestUtil.waitForLeader;
public abstract class RaftAsyncTests<CLUSTER extends MiniRaftCluster> extends
BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
- Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
public static final int NUM_SERVERS = 3;
diff --git a/ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java
b/ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java
index 990369cb1..8bfe66389 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java
@@ -18,7 +18,6 @@
package org.apache.ratis;
import org.apache.ratis.thirdparty.com.codahale.metrics.Gauge;
-import org.apache.log4j.Level;
import org.apache.ratis.RaftTestUtil.SimpleMessage;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.client.impl.RaftClientTestUtil;
@@ -40,12 +39,13 @@ import
org.apache.ratis.server.metrics.ServerMetricsTestUtils;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.util.ExitUtils;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.TimeDuration;
import org.apache.ratis.util.Timestamp;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
+import org.slf4j.event.Level;
import java.io.IOException;
import java.util.List;
@@ -73,7 +73,7 @@ public abstract class RaftBasicTests<CLUSTER extends
MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
RaftServerTestUtil.setStateMachineUpdaterLogLevel(Level.DEBUG);
RaftServerConfigKeys.RetryCache.setExpiryTime(getProperties(),
TimeDuration.valueOf(5, TimeUnit.SECONDS));
diff --git
a/ratis-server/src/test/java/org/apache/ratis/RaftExceptionBaseTest.java
b/ratis-server/src/test/java/org/apache/ratis/RaftExceptionBaseTest.java
index 09b057b9a..9b6d81121 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RaftExceptionBaseTest.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RaftExceptionBaseTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis;
-import org.apache.log4j.Level;
import org.apache.ratis.RaftTestUtil.SimpleMessage;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.client.RaftClientRpc;
@@ -32,11 +31,12 @@ import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.server.raftlog.RaftLogIOException;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.SizeInBytes;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Test;
+import org.slf4j.event.Level;
import java.io.IOException;
import java.util.Arrays;
@@ -47,9 +47,9 @@ public abstract class RaftExceptionBaseTest<CLUSTER extends
MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
static {
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
- Log4jUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
- Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
static final int NUM_PEERS = 3;
diff --git
a/ratis-server/src/test/java/org/apache/ratis/ReadOnlyRequestTests.java
b/ratis-server/src/test/java/org/apache/ratis/ReadOnlyRequestTests.java
index 3d17fc9b4..55bb39ba4 100644
--- a/ratis-server/src/test/java/org/apache/ratis/ReadOnlyRequestTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/ReadOnlyRequestTests.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis;
-import org.apache.log4j.Level;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.protocol.Message;
@@ -34,11 +33,12 @@ import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.statemachine.TransactionContext;
import org.apache.ratis.statemachine.impl.BaseStateMachine;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.TimeDuration;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.event.Level;
import java.nio.charset.StandardCharsets;
import java.util.List;
@@ -51,7 +51,7 @@ public abstract class ReadOnlyRequestTests<CLUSTER extends
MiniRaftCluster>
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
}
static final int NUM_SERVERS = 3;
diff --git
a/ratis-server/src/test/java/org/apache/ratis/ReadOnlyRequestWithLongTimeoutTests.java
b/ratis-server/src/test/java/org/apache/ratis/ReadOnlyRequestWithLongTimeoutTests.java
index 4d43eaa55..61f2b9ec5 100644
---
a/ratis-server/src/test/java/org/apache/ratis/ReadOnlyRequestWithLongTimeoutTests.java
+++
b/ratis-server/src/test/java/org/apache/ratis/ReadOnlyRequestWithLongTimeoutTests.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis;
-import org.apache.log4j.Level;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.protocol.Message;
@@ -30,11 +29,12 @@ import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.statemachine.StateMachine;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.TimeDuration;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.event.Level;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
@@ -44,7 +44,7 @@ public abstract class
ReadOnlyRequestWithLongTimeoutTests<CLUSTER extends MiniRa
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
}
static final int NUM_SERVERS = 3;
diff --git
a/ratis-server/src/test/java/org/apache/ratis/RequestLimitAsyncBaseTest.java
b/ratis-server/src/test/java/org/apache/ratis/RequestLimitAsyncBaseTest.java
index 095ac74ac..19a46a065 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RequestLimitAsyncBaseTest.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RequestLimitAsyncBaseTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis;
-import org.apache.log4j.Level;
import org.apache.ratis.RaftTestUtil.SimpleMessage;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.client.RaftClientConfigKeys;
@@ -31,9 +30,10 @@ import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.impl.RaftServerTestUtil;
import org.apache.ratis.statemachine.impl.SimpleStateMachine4Testing;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.event.Level;
import java.util.ArrayList;
import java.util.List;
@@ -45,8 +45,8 @@ public abstract class RequestLimitAsyncBaseTest<CLUSTER
extends MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
static {
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
- Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
RaftServerTestUtil.setPendingRequestsLogLevel(Level.DEBUG);
}
diff --git a/ratis-server/src/test/java/org/apache/ratis/RetryCacheTests.java
b/ratis-server/src/test/java/org/apache/ratis/RetryCacheTests.java
index 2799d3dcf..f729dcd2d 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RetryCacheTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RetryCacheTests.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis;
-import org.apache.log4j.Level;
import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.impl.MiniRaftCluster.PeerChanges;
import org.apache.ratis.RaftTestUtil.SimpleMessage;
@@ -33,10 +32,11 @@ import org.apache.ratis.server.impl.RetryCacheTestUtil;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.server.raftlog.RaftLogIOException;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.TimeDuration;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.event.Level;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
@@ -47,7 +47,7 @@ public abstract class RetryCacheTests<CLUSTER extends
MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
static {
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
}
public static final int NUM_SERVERS = 3;
diff --git a/ratis-server/src/test/java/org/apache/ratis/WatchRequestTests.java
b/ratis-server/src/test/java/org/apache/ratis/WatchRequestTests.java
index a6658dafb..1f19f9d1c 100644
--- a/ratis-server/src/test/java/org/apache/ratis/WatchRequestTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/WatchRequestTests.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis;
-import org.apache.log4j.Level;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.client.RaftClientConfigKeys;
import org.apache.ratis.conf.RaftProperties;
@@ -36,7 +35,7 @@ import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.impl.RaftServerTestUtil;
import org.apache.ratis.statemachine.impl.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.ProtoUtils;
import org.apache.ratis.util.TimeDuration;
import org.apache.ratis.util.function.CheckedConsumer;
@@ -45,6 +44,7 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
+import org.slf4j.event.Level;
import java.util.ArrayList;
import java.util.Collection;
@@ -62,7 +62,7 @@ public abstract class WatchRequestTests<CLUSTER extends
MiniRaftCluster>
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
RaftServerTestUtil.setWatchRequestsLogLevel(Level.DEBUG);
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
}
static final int NUM_SERVERS = 3;
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupInfoBaseTest.java
b/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupInfoBaseTest.java
index 94959aacc..72eedf0f3 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupInfoBaseTest.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupInfoBaseTest.java
@@ -17,16 +17,16 @@
*/
package org.apache.ratis.server.impl;
-import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.client.api.GroupManagementApi;
import org.apache.ratis.protocol.*;
import org.apache.ratis.proto.RaftProtos.CommitInfoProto;
import org.apache.ratis.server.RaftServer;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.event.Level;
import java.util.Collection;
import java.util.List;
@@ -36,8 +36,8 @@ public abstract class GroupInfoBaseTest<CLUSTER extends
MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
- Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
@Test
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupManagementBaseTest.java
b/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupManagementBaseTest.java
index 2c00892fb..f40afa088 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupManagementBaseTest.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupManagementBaseTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis.server.impl;
-import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.RaftClient;
@@ -34,13 +33,14 @@ import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.util.FileUtils;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.TimeDuration;
import org.apache.ratis.util.function.CheckedBiConsumer;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
import java.io.File;
import java.io.IOException;
@@ -58,9 +58,9 @@ public abstract class GroupManagementBaseTest extends
BaseTest {
static final Logger LOG =
LoggerFactory.getLogger(GroupManagementBaseTest.class);
{
- Log4jUtils.setLogLevel(RaftServer.LOG, Level.DEBUG);
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
- Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
static final RaftProperties prop = new RaftProperties();
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/impl/LeaderElectionTests.java
b/ratis-server/src/test/java/org/apache/ratis/server/impl/LeaderElectionTests.java
index 68b23a492..b41f2bef8 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/impl/LeaderElectionTests.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/impl/LeaderElectionTests.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis.server.impl;
-import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.RaftClient;
@@ -41,7 +40,7 @@ import
org.apache.ratis.server.raftlog.segmented.SegmentedRaftLogTestUtils;
import org.apache.ratis.util.ExitUtils;
import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.LifeCycle;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.TimeDuration;
import org.apache.ratis.util.Timestamp;
import org.junit.Assert;
@@ -73,13 +72,14 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.apache.ratis.thirdparty.com.codahale.metrics.Timer;
+import org.slf4j.event.Level;
public abstract class LeaderElectionTests<CLUSTER extends MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
- Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
@Test
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/impl/PreAppendLeaderStepDownTest.java
b/ratis-server/src/test/java/org/apache/ratis/server/impl/PreAppendLeaderStepDownTest.java
index 93af35658..3cb8284bf 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/impl/PreAppendLeaderStepDownTest.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/impl/PreAppendLeaderStepDownTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis.server.impl;
-import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.RaftClient;
@@ -33,9 +32,10 @@ import
org.apache.ratis.statemachine.impl.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.statemachine.TransactionContext;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.event.Level;
import java.io.IOException;
@@ -47,9 +47,9 @@ import java.io.IOException;
public abstract class PreAppendLeaderStepDownTest<CLUSTER extends
MiniRaftCluster>
extends BaseTest implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
- Log4jUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
- Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
private static volatile boolean leaderShouldStepDown = false;
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
b/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
index 5e6353f92..75e0ea794 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis.server.impl;
-import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.RaftTestUtil.SimpleMessage;
@@ -45,10 +44,11 @@ import org.apache.ratis.server.raftlog.RaftLogBase;
import org.apache.ratis.server.storage.RaftStorageTestUtils;
import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.LifeCycle;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.TimeDuration;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.event.Level;
import java.io.IOException;
import java.util.*;
@@ -66,7 +66,7 @@ public abstract class RaftReconfigurationBaseTest<CLUSTER
extends MiniRaftCluste
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
static {
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
}
private static final DelayLocalExecutionInjection logSyncDelay =
RaftServerTestUtil.getLogSyncDelay();
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftServerTestUtil.java
b/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftServerTestUtil.java
index 02eff400e..618e398b3 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftServerTestUtil.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftServerTestUtil.java
@@ -17,20 +17,12 @@
*/
package org.apache.ratis.server.impl;
-import org.apache.log4j.Appender;
-import org.apache.log4j.Layout;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.PatternLayout;
-import org.apache.log4j.WriterAppender;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.conf.RaftProperties;
-import org.apache.ratis.protocol.RaftClientReply;
import org.apache.ratis.protocol.RaftGroupId;
import org.apache.ratis.protocol.RaftGroupMemberId;
import org.apache.ratis.protocol.RaftPeer;
import org.apache.ratis.protocol.RaftPeerId;
-import org.apache.ratis.protocol.SnapshotManagementRequest;
import org.apache.ratis.server.DataStreamMap;
import org.apache.ratis.server.DataStreamServer;
import org.apache.ratis.server.DivisionInfo;
@@ -41,20 +33,18 @@ import org.apache.ratis.server.leader.LogAppender;
import org.apache.ratis.server.raftlog.segmented.SegmentedRaftLog;
import org.apache.ratis.server.storage.RaftStorage;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.TimeDuration;
import org.junit.Assert;
import org.mockito.Mockito;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
-import java.io.IOException;
-import java.io.StringWriter;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
import java.util.stream.Stream;
public class RaftServerTestUtil {
@@ -68,13 +58,13 @@ public class RaftServerTestUtil {
}
public static void setStateMachineUpdaterLogLevel(Level level) {
- Log4jUtils.setLogLevel(StateMachineUpdater.LOG, level);
+ Slf4jUtils.setLogLevel(StateMachineUpdater.LOG, level);
}
public static void setWatchRequestsLogLevel(Level level) {
- Log4jUtils.setLogLevel(WatchRequests.LOG, level);
+ Slf4jUtils.setLogLevel(WatchRequests.LOG, level);
}
public static void setPendingRequestsLogLevel(Level level) {
- Log4jUtils.setLogLevel(PendingRequests.LOG, level);
+ Slf4jUtils.setLogLevel(PendingRequests.LOG, level);
}
public static void waitAndCheckNewConf(MiniRaftCluster cluster,
@@ -195,58 +185,4 @@ public class RaftServerTestUtil {
public static boolean isHighestPriority(RaftConfiguration config, RaftPeerId
peerId) {
return ((RaftConfigurationImpl)config).isHighestPriority(peerId);
}
-
- public static CompletableFuture<RaftClientReply>
takeSnapshotAsync(RaftServer.Division leader, SnapshotManagementRequest r)
- throws IOException {
- return ((RaftServerImpl)leader).takeSnapshotAsync(r);
- }
-
- /**
- * Class to capture logs for doing assertions.
- */
- public static final class LogCapturer {
- private StringWriter sw = new StringWriter();
- private WriterAppender appender;
- private org.apache.log4j.Logger logger;
-
- public static LogCapturer captureLogs(org.slf4j.Logger logger) {
- return new LogCapturer(toLog4j(logger), getDefaultLayout());
- }
-
- public static LogCapturer captureLogs(org.slf4j.Logger logger, Layout
layout) {
- return new LogCapturer(toLog4j(logger), layout);
- }
-
- private static Layout getDefaultLayout() {
- Appender defaultAppender =
org.apache.log4j.Logger.getRootLogger().getAppender("stdout");
- if (defaultAppender == null) {
- defaultAppender =
org.apache.log4j.Logger.getRootLogger().getAppender("console");
- }
- return (defaultAppender == null) ? new PatternLayout() :
- defaultAppender.getLayout();
- }
-
- private LogCapturer(org.apache.log4j.Logger logger, Layout layout) {
- this.logger = logger;
- this.appender = new WriterAppender(layout, sw);
- logger.addAppender(this.appender);
- }
-
- public String getOutput() {
- return sw.toString();
- }
-
- public void stopCapturing() {
- logger.removeAppender(appender);
- }
-
- public void clearOutput() {
- sw.getBuffer().setLength(0);
- }
- }
-
- @Deprecated
- public static org.apache.log4j.Logger toLog4j(org.slf4j.Logger logger) {
- return LogManager.getLogger(logger.getName());
- }
}
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftStateMachineExceptionTests.java
b/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftStateMachineExceptionTests.java
index 687a4d35a..0f9155e9c 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftStateMachineExceptionTests.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftStateMachineExceptionTests.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis.server.impl;
-import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.RaftTestUtil.SimpleMessage;
@@ -33,9 +32,10 @@ import
org.apache.ratis.statemachine.impl.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.statemachine.TransactionContext;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.event.Level;
import java.io.IOException;
import java.util.Objects;
@@ -46,9 +46,9 @@ import static org.junit.Assert.fail;
public abstract class RaftStateMachineExceptionTests<CLUSTER extends
MiniRaftCluster>
extends BaseTest implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
- Log4jUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
- Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
private static volatile boolean failPreAppend = false;
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/impl/TestRatisServerMetricsBase.java
b/ratis-server/src/test/java/org/apache/ratis/server/impl/TestRatisServerMetricsBase.java
index 88ada6a8f..a465b3c4d 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/impl/TestRatisServerMetricsBase.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/impl/TestRatisServerMetricsBase.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertEquals;
import java.io.IOException;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
-import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.RaftClient;
@@ -32,17 +31,18 @@ import org.apache.ratis.protocol.RaftClientReply;
import org.apache.ratis.protocol.RaftClientRequest;
import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.metrics.RaftServerMetricsImpl;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.event.Level;
/** Tests on Ratis server metrics. */
public abstract class TestRatisServerMetricsBase<CLUSTER extends
MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
- Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
private static final int NUM_SERVERS = 3;
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogTestUtils.java
b/ratis-server/src/test/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogTestUtils.java
index 04527e728..f2387f3f0 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogTestUtils.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogTestUtils.java
@@ -17,12 +17,12 @@
*/
package org.apache.ratis.server.raftlog.segmented;
-import org.apache.log4j.Level;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
+import org.slf4j.event.Level;
public interface SegmentedRaftLogTestUtils {
static void setRaftLogWorkerLogLevel(Level level) {
- Log4jUtils.setLogLevel(SegmentedRaftLogWorker.LOG, level);
+ Slf4jUtils.setLogLevel(SegmentedRaftLogWorker.LOG, level);
}
static String getLogFlushTimeMetric(String memberId) {
diff --git
a/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java
b/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java
index da8eb165e..7418dcb7b 100644
---
a/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java
+++
b/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java
@@ -22,7 +22,6 @@ import static
org.apache.ratis.server.impl.StateMachineMetrics.RATIS_STATEMACHIN
import static
org.apache.ratis.server.impl.StateMachineMetrics.STATEMACHINE_TAKE_SNAPSHOT_TIMER;
import static
org.apache.ratis.metrics.RatisMetrics.RATIS_APPLICATION_NAME_METRICS;
-import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
import org.apache.ratis.metrics.LongCounter;
import org.apache.ratis.metrics.impl.DefaultTimekeeperImpl;
@@ -48,7 +47,7 @@ import
org.apache.ratis.statemachine.impl.SimpleStateMachineStorage;
import org.apache.ratis.util.FileUtils;
import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.LifeCycle;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -64,12 +63,13 @@ import java.util.stream.Collectors;
import java.util.stream.LongStream;
import org.apache.ratis.thirdparty.com.codahale.metrics.Timer;
+import org.slf4j.event.Level;
public abstract class RaftSnapshotBaseTest extends BaseTest {
{
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
- Log4jUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
- Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
static final Logger LOG =
LoggerFactory.getLogger(RaftSnapshotBaseTest.class);
diff --git
a/ratis-server/src/test/java/org/apache/ratis/statemachine/SnapshotManagementTest.java
b/ratis-server/src/test/java/org/apache/ratis/statemachine/SnapshotManagementTest.java
index 39c5caf52..dffeb4228 100644
---
a/ratis-server/src/test/java/org/apache/ratis/statemachine/SnapshotManagementTest.java
+++
b/ratis-server/src/test/java/org/apache/ratis/statemachine/SnapshotManagementTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis.statemachine;
-import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.RaftClient;
@@ -31,12 +30,13 @@ import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.statemachine.impl.SimpleStateMachine4Testing;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
import java.io.File;
@@ -44,9 +44,9 @@ public abstract class SnapshotManagementTest<CLUSTER extends
MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
- Log4jUtils.setLogLevel(RaftLog.LOG, Level.INFO);
- Log4jUtils.setLogLevel(RaftClient.LOG, Level.INFO);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftLog.LOG, Level.INFO);
+ Slf4jUtils.setLogLevel(RaftClient.LOG, Level.INFO);
}
static final Logger LOG =
LoggerFactory.getLogger(SnapshotManagementTest.class);
diff --git
a/ratis-test/src/test/java/org/apache/ratis/TestRaftServerNoLeaderTimeout.java
b/ratis-test/src/test/java/org/apache/ratis/TestRaftServerNoLeaderTimeout.java
index 8492db507..7f4da0e0f 100644
---
a/ratis-test/src/test/java/org/apache/ratis/TestRaftServerNoLeaderTimeout.java
+++
b/ratis-test/src/test/java/org/apache/ratis/TestRaftServerNoLeaderTimeout.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis;
-import org.apache.log4j.Level;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.server.RaftServer;
@@ -27,12 +26,13 @@ import
org.apache.ratis.server.simulation.MiniRaftClusterWithSimulatedRpc;
import org.apache.ratis.proto.RaftProtos;
import org.apache.ratis.statemachine.impl.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.TimeDuration;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.event.Level;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
@@ -42,8 +42,8 @@ import java.util.concurrent.TimeUnit;
*/
public class TestRaftServerNoLeaderTimeout extends BaseTest {
static {
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
- Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
private static final int NUM_SERVERS = 3;
diff --git
a/ratis-test/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java
b/ratis-test/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java
index 224ac646c..0ea0fe9ce 100644
---
a/ratis-test/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java
+++
b/ratis-test/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis;
-import org.apache.log4j.Level;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.metrics.impl.RatisMetricRegistryImpl;
import org.apache.ratis.protocol.RaftPeerId;
@@ -29,7 +28,7 @@ import
org.apache.ratis.server.simulation.MiniRaftClusterWithSimulatedRpc;
import org.apache.ratis.proto.RaftProtos;
import org.apache.ratis.statemachine.impl.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.TimeDuration;
import org.junit.After;
import org.junit.Assert;
@@ -44,6 +43,7 @@ import java.util.SortedMap;
import java.util.concurrent.TimeUnit;
import org.apache.ratis.thirdparty.com.codahale.metrics.Gauge;
+import org.slf4j.event.Level;
/**
* Test Raft Server Slowness detection and notification to Leader's
statemachine.
@@ -52,7 +52,7 @@ import org.apache.ratis.thirdparty.com.codahale.metrics.Gauge;
@Ignore
public class TestRaftServerSlownessDetection extends BaseTest {
static {
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
}
public static final int NUM_SERVERS = 3;
diff --git
a/ratis-test/src/test/java/org/apache/ratis/datastream/TestDataStreamSslWithRpcTypeGrpcAndDataStreamTypeNetty.java
b/ratis-test/src/test/java/org/apache/ratis/datastream/TestDataStreamSslWithRpcTypeGrpcAndDataStreamTypeNetty.java
index 4a69aa434..06702f91a 100644
---
a/ratis-test/src/test/java/org/apache/ratis/datastream/TestDataStreamSslWithRpcTypeGrpcAndDataStreamTypeNetty.java
+++
b/ratis-test/src/test/java/org/apache/ratis/datastream/TestDataStreamSslWithRpcTypeGrpcAndDataStreamTypeNetty.java
@@ -17,22 +17,22 @@
*/
package org.apache.ratis.datastream;
-import org.apache.log4j.Level;
import org.apache.ratis.conf.Parameters;
import org.apache.ratis.netty.NettyConfigKeys;
import org.apache.ratis.netty.NettyUtils;
import org.apache.ratis.security.SecurityTestUtils;
import org.apache.ratis.security.TlsConf;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.junit.Ignore;
+import org.slf4j.event.Level;
import java.util.function.Supplier;
public class TestDataStreamSslWithRpcTypeGrpcAndDataStreamTypeNetty
extends
DataStreamAsyncClusterTests<MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty>
{
{
- Log4jUtils.setLogLevel(NettyUtils.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(NettyUtils.LOG, Level.DEBUG);
}
Parameters newParameters() {
diff --git
a/ratis-test/src/test/java/org/apache/ratis/grpc/TestLogAppenderWithGrpc.java
b/ratis-test/src/test/java/org/apache/ratis/grpc/TestLogAppenderWithGrpc.java
index 0d90da5a0..a91bc4d91 100644
---
a/ratis-test/src/test/java/org/apache/ratis/grpc/TestLogAppenderWithGrpc.java
+++
b/ratis-test/src/test/java/org/apache/ratis/grpc/TestLogAppenderWithGrpc.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis.grpc;
-import org.apache.log4j.Level;
import org.apache.ratis.LogAppenderTests;
import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
@@ -32,11 +31,12 @@ import org.apache.ratis.server.impl.RaftServerTestUtil;
import org.apache.ratis.statemachine.impl.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.slf4j.event.Level;
import java.io.IOException;
import java.util.ArrayList;
@@ -51,7 +51,7 @@ public class TestLogAppenderWithGrpc
extends LogAppenderTests<MiniRaftClusterWithGrpc>
implements MiniRaftClusterWithGrpc.FactoryGet {
{
- Log4jUtils.setLogLevel(FollowerInfo.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(FollowerInfo.LOG, Level.DEBUG);
}
public TestLogAppenderWithGrpc(Boolean separateHeartbeat) {
diff --git
a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftServerWithGrpc.java
b/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftServerWithGrpc.java
index cdc076162..e85b6ad19 100644
--- a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftServerWithGrpc.java
+++ b/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftServerWithGrpc.java
@@ -24,7 +24,6 @@ import static
org.apache.ratis.server.metrics.RaftServerMetricsImpl.RAFT_CLIENT_
import org.apache.ratis.metrics.RatisMetricRegistry;
import org.apache.ratis.server.storage.RaftStorage;
-import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
import org.apache.ratis.metrics.impl.DefaultTimekeeperImpl;
import org.apache.ratis.protocol.RaftGroup;
@@ -53,7 +52,7 @@ import org.apache.ratis.server.metrics.RaftServerMetricsImpl;
import org.apache.ratis.statemachine.impl.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.ProtoUtils;
import org.apache.ratis.util.SizeInBytes;
import org.apache.ratis.util.TimeDuration;
@@ -62,6 +61,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.slf4j.event.Level;
import java.io.IOException;
import java.nio.channels.OverlappingFileLockException;
@@ -76,7 +76,7 @@ import java.util.concurrent.atomic.AtomicLong;
@RunWith(Parameterized.class)
public class TestRaftServerWithGrpc extends BaseTest implements
MiniRaftClusterWithGrpc.FactoryGet {
{
- Log4jUtils.setLogLevel(GrpcClientProtocolClient.LOG, Level.ALL);
+ Slf4jUtils.setLogLevel(GrpcClientProtocolClient.LOG, Level.TRACE);
}
public TestRaftServerWithGrpc(Boolean separateHeartbeat) {
diff --git
a/ratis-test/src/test/java/org/apache/ratis/grpc/TestWatchRequestWithGrpc.java
b/ratis-test/src/test/java/org/apache/ratis/grpc/TestWatchRequestWithGrpc.java
index 65c6fabe2..782494e57 100644
---
a/ratis-test/src/test/java/org/apache/ratis/grpc/TestWatchRequestWithGrpc.java
+++
b/ratis-test/src/test/java/org/apache/ratis/grpc/TestWatchRequestWithGrpc.java
@@ -17,19 +17,19 @@
*/
package org.apache.ratis.grpc;
-import org.apache.log4j.Level;
import org.apache.ratis.WatchRequestTests;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.client.impl.UnorderedAsync;
import org.apache.ratis.grpc.client.GrpcClientRpc;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
+import org.slf4j.event.Level;
public class TestWatchRequestWithGrpc
extends WatchRequestTests<MiniRaftClusterWithGrpc>
implements MiniRaftClusterWithGrpc.FactoryGet {
{
- Log4jUtils.setLogLevel(GrpcClientRpc.LOG, Level.ALL);
- Log4jUtils.setLogLevel(UnorderedAsync.LOG, Level.ALL);
- Log4jUtils.setLogLevel(RaftClient.LOG, Level.ALL);
+ Slf4jUtils.setLogLevel(GrpcClientRpc.LOG, Level.TRACE);
+ Slf4jUtils.setLogLevel(UnorderedAsync.LOG, Level.TRACE);
+ Slf4jUtils.setLogLevel(RaftClient.LOG, Level.TRACE);
}
}
\ No newline at end of file
diff --git
a/ratis-test/src/test/java/org/apache/ratis/server/ServerRestartTests.java
b/ratis-test/src/test/java/org/apache/ratis/server/ServerRestartTests.java
index f1e0652e0..f2e05253b 100644
--- a/ratis-test/src/test/java/org/apache/ratis/server/ServerRestartTests.java
+++ b/ratis-test/src/test/java/org/apache/ratis/server/ServerRestartTests.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis.server;
-import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
@@ -42,7 +41,7 @@ import
org.apache.ratis.statemachine.impl.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.util.FileUtils;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.Preconditions;
import org.apache.ratis.util.SizeInBytes;
import org.apache.ratis.util.StringUtils;
@@ -50,6 +49,7 @@ import org.apache.ratis.util.TimeDuration;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
+import org.slf4j.event.Level;
import java.io.File;
import java.io.IOException;
@@ -71,7 +71,7 @@ public abstract class ServerRestartTests<CLUSTER extends
MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
}
static final int NUM_SERVERS = 3;
diff --git
a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/memory/MemoryRaftLogTest.java
b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/memory/MemoryRaftLogTest.java
index fec64f0a1..5d8d090a3 100644
---
a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/memory/MemoryRaftLogTest.java
+++
b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/memory/MemoryRaftLogTest.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertEquals;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
-import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.conf.RaftProperties;
@@ -34,12 +33,13 @@ import org.apache.ratis.server.raftlog.LogEntryHeader;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.statemachine.impl.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.junit.Test;
+import org.slf4j.event.Level;
public class MemoryRaftLogTest extends BaseTest {
static {
- Log4jUtils.setLogLevel(MemoryRaftLog.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(MemoryRaftLog.LOG, Level.DEBUG);
}
@Test
diff --git
a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLog.java
b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLog.java
index e66cb7153..92b6f7d3c 100644
---
a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLog.java
+++
b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLog.java
@@ -19,7 +19,6 @@ package org.apache.ratis.server.raftlog.segmented;
import static org.junit.Assert.assertTrue;
-import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
import org.apache.ratis.RaftTestUtil.SimpleOperation;
import org.apache.ratis.conf.RaftProperties;
@@ -44,7 +43,7 @@ import
org.apache.ratis.statemachine.impl.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.statemachine.impl.BaseStateMachine;
import org.apache.ratis.util.LifeCycle;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.FileUtils;
import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.SizeInBytes;
@@ -71,13 +70,14 @@ import java.util.function.Supplier;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.slf4j.event.Level;
@RunWith(Parameterized.class)
public class TestSegmentedRaftLog extends BaseTest {
static {
- Log4jUtils.setLogLevel(SegmentedRaftLogWorker.LOG, Level.INFO);
- Log4jUtils.setLogLevel(SegmentedRaftLogCache.LOG, Level.INFO);
- Log4jUtils.setLogLevel(SegmentedRaftLog.LOG, Level.INFO);
+ Slf4jUtils.setLogLevel(SegmentedRaftLogWorker.LOG, Level.INFO);
+ Slf4jUtils.setLogLevel(SegmentedRaftLogCache.LOG, Level.INFO);
+ Slf4jUtils.setLogLevel(SegmentedRaftLog.LOG, Level.INFO);
}
private final Boolean smSyncFlush;
diff --git
a/ratis-test/src/test/java/org/apache/ratis/shell/cli/sh/ElectionCommandIntegrationTest.java
b/ratis-test/src/test/java/org/apache/ratis/shell/cli/sh/ElectionCommandIntegrationTest.java
index e88becb57..f3ea7c3ab 100644
---
a/ratis-test/src/test/java/org/apache/ratis/shell/cli/sh/ElectionCommandIntegrationTest.java
+++
b/ratis-test/src/test/java/org/apache/ratis/shell/cli/sh/ElectionCommandIntegrationTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis.shell.cli.sh;
-import org.apache.log4j.Level;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.conf.RaftProperties;
@@ -28,11 +27,12 @@ import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.statemachine.impl.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.SizeInBytes;
import org.apache.ratis.util.TimeDuration;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.event.Level;
import java.util.concurrent.TimeUnit;
@@ -40,9 +40,9 @@ public abstract class ElectionCommandIntegrationTest <CLUSTER
extends MiniRaftCl
extends AbstractCommandIntegrationTestWithGrpc implements
MiniRaftCluster.Factory.Get<CLUSTER>{
{
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.WARN);
- Log4jUtils.setLogLevel(RaftLog.LOG, Level.WARN);
- Log4jUtils.setLogLevel(RaftClient.LOG, Level.WARN);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.WARN);
+ Slf4jUtils.setLogLevel(RaftLog.LOG, Level.WARN);
+ Slf4jUtils.setLogLevel(RaftClient.LOG, Level.WARN);
}
{
diff --git
a/ratis-test/src/test/java/org/apache/ratis/shell/cli/sh/GroupCommandIntegrationTest.java
b/ratis-test/src/test/java/org/apache/ratis/shell/cli/sh/GroupCommandIntegrationTest.java
index 93d4e7bbd..c745307d2 100644
---
a/ratis-test/src/test/java/org/apache/ratis/shell/cli/sh/GroupCommandIntegrationTest.java
+++
b/ratis-test/src/test/java/org/apache/ratis/shell/cli/sh/GroupCommandIntegrationTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis.shell.cli.sh;
-import org.apache.log4j.Level;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.conf.RaftProperties;
@@ -27,11 +26,12 @@ import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.statemachine.impl.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.SizeInBytes;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.event.Level;
public abstract class GroupCommandIntegrationTest<CLUSTER extends
MiniRaftCluster>
extends AbstractCommandIntegrationTestWithGrpc
@@ -40,9 +40,9 @@ public abstract class GroupCommandIntegrationTest<CLUSTER
extends MiniRaftCluste
static final String NEW_LINE = System.lineSeparator();
{
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.WARN);
- Log4jUtils.setLogLevel(RaftLog.LOG, Level.WARN);
- Log4jUtils.setLogLevel(RaftClient.LOG, Level.WARN);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.WARN);
+ Slf4jUtils.setLogLevel(RaftLog.LOG, Level.WARN);
+ Slf4jUtils.setLogLevel(RaftClient.LOG, Level.WARN);
}
{
diff --git
a/ratis-test/src/test/java/org/apache/ratis/shell/cli/sh/PeerCommandIntegrationTest.java
b/ratis-test/src/test/java/org/apache/ratis/shell/cli/sh/PeerCommandIntegrationTest.java
index ef0a3a7db..80400309e 100644
---
a/ratis-test/src/test/java/org/apache/ratis/shell/cli/sh/PeerCommandIntegrationTest.java
+++
b/ratis-test/src/test/java/org/apache/ratis/shell/cli/sh/PeerCommandIntegrationTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis.shell.cli.sh;
-import org.apache.log4j.Level;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.conf.RaftProperties;
@@ -31,11 +30,12 @@ import
org.apache.ratis.statemachine.impl.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.thirdparty.com.google.common.collect.ObjectArrays;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.SizeInBytes;
import org.apache.ratis.util.TimeDuration;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.event.Level;
import java.util.concurrent.TimeUnit;
@@ -43,9 +43,9 @@ public abstract class PeerCommandIntegrationTest <CLUSTER
extends MiniRaftCluste
extends AbstractCommandIntegrationTestWithGrpc implements
MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.WARN);
- Log4jUtils.setLogLevel(RaftLog.LOG, Level.WARN);
- Log4jUtils.setLogLevel(RaftClient.LOG, Level.WARN);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.WARN);
+ Slf4jUtils.setLogLevel(RaftLog.LOG, Level.WARN);
+ Slf4jUtils.setLogLevel(RaftClient.LOG, Level.WARN);
}
{
diff --git
a/ratis-test/src/test/java/org/apache/ratis/shell/cli/sh/SnapshotCommandIntegrationTest.java
b/ratis-test/src/test/java/org/apache/ratis/shell/cli/sh/SnapshotCommandIntegrationTest.java
index 8d9af8c3c..3c0ee9772 100644
---
a/ratis-test/src/test/java/org/apache/ratis/shell/cli/sh/SnapshotCommandIntegrationTest.java
+++
b/ratis-test/src/test/java/org/apache/ratis/shell/cli/sh/SnapshotCommandIntegrationTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.ratis.shell.cli.sh;
-import org.apache.log4j.Level;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.conf.RaftProperties;
@@ -29,10 +28,11 @@ import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.statemachine.impl.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.apache.ratis.util.SizeInBytes;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.event.Level;
import java.io.File;
@@ -41,9 +41,9 @@ public abstract class SnapshotCommandIntegrationTest <CLUSTER
extends MiniRaftCl
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.WARN);
- Log4jUtils.setLogLevel(RaftLog.LOG, Level.WARN);
- Log4jUtils.setLogLevel(RaftClient.LOG, Level.WARN);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.WARN);
+ Slf4jUtils.setLogLevel(RaftLog.LOG, Level.WARN);
+ Slf4jUtils.setLogLevel(RaftClient.LOG, Level.WARN);
}
{
diff --git
a/ratis-test/src/test/java/org/apache/ratis/statemachine/TestStateMachine.java
b/ratis-test/src/test/java/org/apache/ratis/statemachine/TestStateMachine.java
index d4d307178..8e37947d3 100644
---
a/ratis-test/src/test/java/org/apache/ratis/statemachine/TestStateMachine.java
+++
b/ratis-test/src/test/java/org/apache/ratis/statemachine/TestStateMachine.java
@@ -19,7 +19,6 @@ package org.apache.ratis.statemachine;
import java.util.ArrayList;
import java.util.concurrent.TimeUnit;
-import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
@@ -35,8 +34,9 @@ import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.simulation.MiniRaftClusterWithSimulatedRpc;
import org.apache.ratis.statemachine.impl.SimpleStateMachine4Testing;
-import org.apache.ratis.util.Log4jUtils;
+import org.apache.ratis.util.Slf4jUtils;
import org.junit.*;
+import org.slf4j.event.Level;
import java.util.Collections;
import java.util.List;
@@ -55,8 +55,8 @@ import static org.junit.Assert.*;
*/
public class TestStateMachine extends BaseTest implements
MiniRaftClusterWithSimulatedRpc.FactoryGet {
static {
- Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
- Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
public static final int NUM_SERVERS = 3;
diff --git
a/ratis-test/src/test/java/org/apache/ratis/util/TestTimeDuration.java
b/ratis-test/src/test/java/org/apache/ratis/util/TestTimeDuration.java
index edb0ad8a2..b21884fd9 100644
--- a/ratis-test/src/test/java/org/apache/ratis/util/TestTimeDuration.java
+++ b/ratis-test/src/test/java/org/apache/ratis/util/TestTimeDuration.java
@@ -17,9 +17,9 @@
*/
package org.apache.ratis.util;
-import org.apache.log4j.Level;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.event.Level;
import java.util.Arrays;
import java.util.List;
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertTrue;
public class TestTimeDuration {
{
- Log4jUtils.setLogLevel(TimeDuration.LOG, Level.DEBUG);
+ Slf4jUtils.setLogLevel(TimeDuration.LOG, Level.DEBUG);
}
@Test(timeout = 1000)
diff --git
a/ratis-test/src/test/java/org/apache/ratis/util/TestTimeoutScheduler.java
b/ratis-test/src/test/java/org/apache/ratis/util/TestTimeoutScheduler.java
index cca1cfdea..848428f5b 100644
--- a/ratis-test/src/test/java/org/apache/ratis/util/TestTimeoutScheduler.java
+++ b/ratis-test/src/test/java/org/apache/ratis/util/TestTimeoutScheduler.java
@@ -17,10 +17,10 @@
*/
package org.apache.ratis.util;
-import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.event.Level;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -28,7 +28,7 @@ import java.util.function.Consumer;
public class TestTimeoutScheduler extends BaseTest {
{
- Log4jUtils.setLogLevel(TimeoutScheduler.LOG, Level.ALL);
+ Slf4jUtils.setLogLevel(TimeoutScheduler.LOG, Level.TRACE);
}
static class ErrorHandler implements Consumer<RuntimeException> {
