This is an automated email from the ASF dual-hosted git repository.
szetszwo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ratis.git
The following commit(s) were added to refs/heads/master by this push:
new bb569c2 RATIS-508. Switch from log4j to slf4j. Contributed by Henrik
Hegardt
bb569c2 is described below
commit bb569c2397dac094a28c9f729c235c6334ec0ce9
Author: Tsz Wo Nicholas Sze <[email protected]>
AuthorDate: Wed Oct 30 09:47:17 2019 -0700
RATIS-508. Switch from log4j to slf4j. Contributed by Henrik Hegardt
---
pom.xml | 7 ++++++
.../main/java/org/apache/ratis/util/LogUtils.java | 12 ----------
.../src/test/java/org/apache/ratis/BaseTest.java | 6 ++---
.../java/org/apache/ratis/util/Log4jUtils.java | 27 +++++++++++-----------
ratis-examples/pom.xml | 10 ++++++++
.../org/apache/ratis/examples/common/Runner.java | 17 ++++----------
ratis-examples/src/main/resources/log4j.properties | 2 ++
.../java/org/apache/ratis/TestMultiRaftGroup.java | 4 ++--
.../ratis/examples/arithmetic/TestArithmetic.java | 4 ++--
ratis-grpc/pom.xml | 4 ++++
ratis-hadoop/pom.xml | 4 ++++
.../hadooprpc/TestLeaderElectionWithHadoopRpc.java | 4 ++--
.../ratis/hadooprpc/TestRaftWithHadoopRpc.java | 4 ++--
ratis-logservice/pom.xml | 4 ++++
ratis-metrics/pom.xml | 4 ++++
ratis-netty/pom.xml | 4 ++++
ratis-replicated-map/pom.xml | 4 ++++
ratis-server/pom.xml | 9 ++++++++
.../ratis/InstallSnapshotNotificationTests.java | 4 ++--
.../java/org/apache/ratis/LogAppenderTests.java | 4 ++--
.../org/apache/ratis/RaftAsyncExceptionTests.java | 4 ++--
.../test/java/org/apache/ratis/RaftAsyncTests.java | 6 ++---
.../test/java/org/apache/ratis/RaftBasicTests.java | 6 ++---
.../org/apache/ratis/RaftExceptionBaseTest.java | 8 +++----
.../apache/ratis/RequestLimitAsyncBaseTest.java | 6 ++---
.../java/org/apache/ratis/RetryCacheTests.java | 4 ++--
.../java/org/apache/ratis/WatchRequestTests.java | 4 ++--
.../ratis/server/impl/GroupInfoBaseTest.java | 6 ++---
.../ratis/server/impl/GroupManagementBaseTest.java | 8 +++----
.../ratis/server/impl/LeaderElectionTests.java | 6 ++---
.../server/impl/RaftReconfigurationBaseTest.java | 4 ++--
.../ratis/server/impl/RaftServerTestUtil.java | 6 ++---
.../impl/RaftStateMachineExceptionTests.java | 8 +++----
.../segmented/SegmentedRaftLogTestUtils.java | 4 ++--
.../ratis/statemachine/RaftSnapshotBaseTest.java | 8 +++----
ratis-test/pom.xml | 9 ++++++++
.../ratis/TestRaftServerNoLeaderTimeout.java | 6 ++---
.../ratis/TestRaftServerSlownessDetection.java | 4 ++--
.../apache/ratis/grpc/TestGrpcOutputStream.java | 4 ++--
.../ratis/grpc/TestRaftOutputStreamWithGrpc.java | 4 ++--
.../apache/ratis/grpc/TestRaftServerWithGrpc.java | 6 ++---
.../ratis/grpc/TestWatchRequestWithGrpc.java | 10 ++++----
.../apache/ratis/server/ServerRestartTests.java | 4 ++--
.../raftlog/segmented/TestSegmentedRaftLog.java | 8 +++----
.../ratis/statemachine/TestStateMachine.java | 7 +++---
.../apache/ratis/util/TestTimeoutScheduler.java | 2 +-
46 files changed, 165 insertions(+), 125 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5dd1c93..50af20c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -375,8 +375,15 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
<version>1.7.10</version>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>com.beust</groupId>
diff --git a/ratis-common/src/main/java/org/apache/ratis/util/LogUtils.java
b/ratis-common/src/main/java/org/apache/ratis/util/LogUtils.java
index 92a03cc..7adba68 100644
--- a/ratis-common/src/main/java/org/apache/ratis/util/LogUtils.java
+++ b/ratis-common/src/main/java/org/apache/ratis/util/LogUtils.java
@@ -17,8 +17,6 @@
*/
package org.apache.ratis.util;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
import org.apache.ratis.util.function.CheckedRunnable;
import org.apache.ratis.util.function.CheckedSupplier;
import org.slf4j.Logger;
@@ -33,16 +31,6 @@ import java.util.function.Supplier;
public interface LogUtils {
Logger LOG = LoggerFactory.getLogger(LogUtils.class);
- static void setLogLevel(Logger logger, Level level) {
- final String name = logger.getName();
- if (LOG.isTraceEnabled()) {
- LOG.trace("", new Throwable("Set " + name + " log level to " + level));
- } else {
- LOG.info("Set {} log level to {}", name, level);
- }
- LogManager.getLogger(name).setLevel(level);
- }
-
static <THROWABLE extends Throwable> void runAndLog(
Logger log, CheckedRunnable<THROWABLE> op, Supplier<String> opName)
throws THROWABLE {
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 7e8868d..792cc30 100644
--- a/ratis-common/src/test/java/org/apache/ratis/BaseTest.java
+++ b/ratis-common/src/test/java/org/apache/ratis/BaseTest.java
@@ -22,7 +22,7 @@ import org.apache.ratis.conf.ConfUtils;
import org.apache.ratis.util.ExitUtils;
import org.apache.ratis.util.FileUtils;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.apache.ratis.util.TimeDuration;
import org.apache.ratis.util.function.CheckedRunnable;
import org.junit.After;
@@ -51,8 +51,8 @@ public abstract class BaseTest {
public static final TimeDuration FIVE_SECONDS = TimeDuration.valueOf(5,
TimeUnit.SECONDS);
{
- LogUtils.setLogLevel(ConfUtils.LOG, Level.WARN);
- LogUtils.setLogLevel(FileUtils.LOG, Level.TRACE);
+ Log4jUtils.setLogLevel(ConfUtils.LOG, Level.WARN);
+ Log4jUtils.setLogLevel(FileUtils.LOG, Level.TRACE);
ExitUtils.disableSystemExit();
}
diff --git
a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftOutputStreamWithGrpc.java
b/ratis-common/src/test/java/org/apache/ratis/util/Log4jUtils.java
similarity index 63%
copy from
ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftOutputStreamWithGrpc.java
copy to ratis-common/src/test/java/org/apache/ratis/util/Log4jUtils.java
index 1c4202b..da54630 100644
---
a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftOutputStreamWithGrpc.java
+++ b/ratis-common/src/test/java/org/apache/ratis/util/Log4jUtils.java
@@ -1,3 +1,5 @@
+package org.apache.ratis.util;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -15,22 +17,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ratis.grpc;
import org.apache.log4j.Level;
-import org.apache.ratis.OutputStreamBaseTest;
-import org.apache.ratis.grpc.client.GrpcClientProtocolService;
-import org.apache.ratis.util.LogUtils;
+import org.apache.log4j.LogManager;
+import org.slf4j.Logger;
-public class TestRaftOutputStreamWithGrpc
- extends OutputStreamBaseTest<MiniRaftClusterWithGrpc>
- implements MiniRaftClusterWithGrpc.FactoryGet {
- {
- LogUtils.setLogLevel(GrpcClientProtocolService.LOG, Level.TRACE);
- }
+public interface Log4jUtils {
- @Override
- public int getGlobalTimeoutSeconds() {
- return 30;
+ static void setLogLevel(Logger logger, Level level) {
+ final String name = logger.getName();
+ if (LogUtils.LOG.isTraceEnabled()) {
+ LogUtils.LOG.trace("", new Throwable("Set " + name + " log level to " +
level));
+ } else {
+ LogUtils.LOG.info("Set {} log level to {}", name, level);
+ }
+ LogManager.getLogger(name).setLevel(level);
}
+
}
diff --git a/ratis-examples/pom.xml b/ratis-examples/pom.xml
index 1686860..592a754 100644
--- a/ratis-examples/pom.xml
+++ b/ratis-examples/pom.xml
@@ -113,6 +113,16 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
diff --git
a/ratis-examples/src/main/java/org/apache/ratis/examples/common/Runner.java
b/ratis-examples/src/main/java/org/apache/ratis/examples/common/Runner.java
index 944ce6b..38fb272 100644
--- a/ratis-examples/src/main/java/org/apache/ratis/examples/common/Runner.java
+++ b/ratis-examples/src/main/java/org/apache/ratis/examples/common/Runner.java
@@ -19,12 +19,8 @@ package org.apache.ratis.examples.common;
import com.beust.jcommander.JCommander;
import com.beust.jcommander.ParameterException;
-import org.apache.log4j.Level;
-import org.apache.ratis.client.RaftClient;
import org.apache.ratis.examples.arithmetic.cli.Arithmetic;
import org.apache.ratis.examples.filestore.cli.FileStore;
-import org.apache.ratis.server.impl.RaftServerImpl;
-import org.apache.ratis.util.LogUtils;
import java.util.List;
import java.util.Optional;
@@ -34,11 +30,6 @@ import java.util.Optional;
*/
public class Runner {
- static {
- LogUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
- LogUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
- }
-
public static void main(String[] args) throws Exception {
if (args.length == 0) {
System.err.println("No command type specified: ");
@@ -61,8 +52,8 @@ public class Runner {
try {
jc.parse(newArgs);
Optional<SubCommandBase> selectedCommand = commands.stream().filter(
- command -> command.getClass().getSimpleName().toLowerCase()
- .equals(jc.getParsedCommand())).findFirst();
+ command -> command.getClass().getSimpleName()
+ .equalsIgnoreCase(jc.getParsedCommand())).findFirst();
if (selectedCommand.isPresent()) {
selectedCommand.get().run();
} else {
@@ -76,9 +67,9 @@ public class Runner {
}
private static List<SubCommandBase> initializeCommands(String command) {
- if (command.equals(FileStore.class.getSimpleName().toLowerCase())) {
+ if (command.equalsIgnoreCase(FileStore.class.getSimpleName())) {
return FileStore.getSubCommands();
- } else if (command.equals(Arithmetic.class.getSimpleName().toLowerCase()))
{
+ } else if (command.equalsIgnoreCase(Arithmetic.class.getSimpleName())) {
return Arithmetic.getSubCommands();
}
return null;
diff --git a/ratis-examples/src/main/resources/log4j.properties
b/ratis-examples/src/main/resources/log4j.properties
index f70e04f..f5b4baf 100644
--- a/ratis-examples/src/main/resources/log4j.properties
+++ b/ratis-examples/src/main/resources/log4j.properties
@@ -16,6 +16,8 @@
log4j.rootLogger=INFO, stdout
+log4j.logger.org.apache.ratis.server.impl.RatisServerImpl=DEBUG
+log4j.logger.org.apache.ratis.client.RaftClient=DEBUG
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Target=System.out
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 68d19be..a6e8bfd 100644
--- a/ratis-examples/src/test/java/org/apache/ratis/TestMultiRaftGroup.java
+++ b/ratis-examples/src/test/java/org/apache/ratis/TestMultiRaftGroup.java
@@ -26,7 +26,7 @@ import org.apache.ratis.examples.arithmetic.TestArithmetic;
import org.apache.ratis.protocol.RaftGroup;
import org.apache.ratis.server.impl.GroupManagementBaseTest;
import org.apache.ratis.server.impl.RaftServerImpl;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.apache.ratis.util.function.CheckedBiConsumer;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -39,7 +39,7 @@ import java.util.concurrent.atomic.AtomicInteger;
@RunWith(Parameterized.class)
public class TestMultiRaftGroup extends BaseTest {
static {
- LogUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServerImpl.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 acd1935..f2cedce 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
@@ -26,7 +26,7 @@ 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.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.apache.ratis.util.Preconditions;
import org.junit.Assert;
import org.junit.Test;
@@ -41,7 +41,7 @@ import static
org.apache.ratis.examples.arithmetic.expression.UnaryExpression.Op
public class TestArithmetic extends ParameterizedBaseTest {
{
- LogUtils.setLogLevel(ArithmeticStateMachine.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(ArithmeticStateMachine.LOG, Level.DEBUG);
}
@Parameterized.Parameters
diff --git a/ratis-grpc/pom.xml b/ratis-grpc/pom.xml
index 5b6ca6d..7c06a1c 100644
--- a/ratis-grpc/pom.xml
+++ b/ratis-grpc/pom.xml
@@ -69,6 +69,10 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/ratis-hadoop/pom.xml b/ratis-hadoop/pom.xml
index b6cabae..c8a87de 100644
--- a/ratis-hadoop/pom.xml
+++ b/ratis-hadoop/pom.xml
@@ -72,6 +72,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
diff --git
a/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestLeaderElectionWithHadoopRpc.java
b/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestLeaderElectionWithHadoopRpc.java
index b7cd60a..acf1a90 100644
---
a/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestLeaderElectionWithHadoopRpc.java
+++
b/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestLeaderElectionWithHadoopRpc.java
@@ -22,14 +22,14 @@ import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.apache.log4j.Level;
import org.apache.ratis.server.impl.BlockRequestHandlingInjection;
import org.apache.ratis.server.impl.LeaderElectionTests;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.junit.Test;
public class TestLeaderElectionWithHadoopRpc
extends LeaderElectionTests<MiniRaftClusterWithHadoopRpc>
implements MiniRaftClusterWithHadoopRpc.Factory.Get {
static {
- LogUtils.setLogLevel(MiniRaftClusterWithHadoopRpc.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(MiniRaftClusterWithHadoopRpc.LOG, Level.DEBUG);
}
@Override
diff --git
a/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftWithHadoopRpc.java
b/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftWithHadoopRpc.java
index 659d37c..4808726 100644
---
a/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftWithHadoopRpc.java
+++
b/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftWithHadoopRpc.java
@@ -24,13 +24,13 @@ import org.apache.ratis.MiniRaftCluster;
import org.apache.ratis.RaftBasicTests;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.server.impl.BlockRequestHandlingInjection;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.junit.Test;
public class TestRaftWithHadoopRpc
extends RaftBasicTests<MiniRaftClusterWithHadoopRpc> {
static {
- LogUtils.setLogLevel(MiniRaftClusterWithHadoopRpc.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(MiniRaftClusterWithHadoopRpc.LOG, Level.DEBUG);
}
static final Configuration CONF = new Configuration();
diff --git a/ratis-logservice/pom.xml b/ratis-logservice/pom.xml
index 52133d2..86315e7 100644
--- a/ratis-logservice/pom.xml
+++ b/ratis-logservice/pom.xml
@@ -203,6 +203,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
<!-- Test Ratis dependencies -->
<dependency>
<artifactId>ratis-netty</artifactId>
diff --git a/ratis-metrics/pom.xml b/ratis-metrics/pom.xml
index 4ff3d6c..652d135 100644
--- a/ratis-metrics/pom.xml
+++ b/ratis-metrics/pom.xml
@@ -34,6 +34,10 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/ratis-netty/pom.xml b/ratis-netty/pom.xml
index bfaebee..e803cb2 100644
--- a/ratis-netty/pom.xml
+++ b/ratis-netty/pom.xml
@@ -72,5 +72,9 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/ratis-replicated-map/pom.xml b/ratis-replicated-map/pom.xml
index d54e04a..1145a65 100644
--- a/ratis-replicated-map/pom.xml
+++ b/ratis-replicated-map/pom.xml
@@ -99,6 +99,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ratis-server/pom.xml b/ratis-server/pom.xml
index 3059790..e8db63f 100644
--- a/ratis-server/pom.xml
+++ b/ratis-server/pom.xml
@@ -59,6 +59,15 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
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 8ce6cda..6ab767e 100644
---
a/ratis-server/src/test/java/org/apache/ratis/InstallSnapshotNotificationTests.java
+++
b/ratis-server/src/test/java/org/apache/ratis/InstallSnapshotNotificationTests.java
@@ -36,7 +36,7 @@ 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.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.apache.ratis.util.SizeInBytes;
import org.junit.Assert;
import org.junit.Test;
@@ -57,7 +57,7 @@ public abstract class
InstallSnapshotNotificationTests<CLUSTER extends MiniRaftC
static final Logger LOG =
LoggerFactory.getLogger(InstallSnapshotNotificationTests.class);
{
- LogUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
+ Log4jUtils.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 40f8dc0..d73268d 100644
--- a/ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java
@@ -37,7 +37,7 @@ import org.apache.ratis.server.metrics.RatisMetrics;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.statemachine.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.apache.ratis.util.SizeInBytes;
import org.junit.Assert;
import org.junit.Test;
@@ -60,7 +60,7 @@ public abstract class LogAppenderTests<CLUSTER extends
MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- LogUtils.setLogLevel(LogAppender.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(LogAppender.LOG, Level.DEBUG);
}
{
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 4e8f68e..9b2ad9b 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RaftAsyncExceptionTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RaftAsyncExceptionTests.java
@@ -29,7 +29,7 @@ import org.apache.ratis.protocol.RaftGroup;
import org.apache.ratis.protocol.RaftGroupId;
import org.apache.ratis.statemachine.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.junit.Assert;
import org.junit.Test;
@@ -44,7 +44,7 @@ public abstract class RaftAsyncExceptionTests<CLUSTER extends
MiniRaftCluster>
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- LogUtils.setLogLevel(OrderedAsync.LOG, Level.DEBUG);
+ Log4jUtils.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 8760147..fc1f100 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RaftAsyncTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RaftAsyncTests.java
@@ -43,7 +43,7 @@ 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.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.apache.ratis.util.TimeDuration;
import org.apache.ratis.util.function.CheckedRunnable;
import org.junit.Assert;
@@ -67,8 +67,8 @@ import static org.apache.ratis.RaftTestUtil.waitForLeader;
public abstract class RaftAsyncTests<CLUSTER extends MiniRaftCluster> extends
BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- LogUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
- LogUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.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 f07eb7c..f550e47 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java
@@ -35,7 +35,7 @@ import org.apache.ratis.proto.RaftProtos.LogEntryProto;
import org.apache.ratis.statemachine.impl.BaseStateMachine;
import org.apache.ratis.util.ExitUtils;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.apache.ratis.util.TimeDuration;
import org.apache.ratis.util.Timestamp;
import org.junit.Assert;
@@ -62,8 +62,8 @@ public abstract class RaftBasicTests<CLUSTER extends
MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- LogUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
- LogUtils.setLogLevel(RaftServerTestUtil.getStateMachineUpdaterLog(),
Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServerTestUtil.getStateMachineUpdaterLog(),
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 ea1832c..89653af 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RaftExceptionBaseTest.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RaftExceptionBaseTest.java
@@ -27,7 +27,7 @@ import org.apache.ratis.server.impl.RaftServerImpl;
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.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.apache.ratis.util.SizeInBytes;
import org.junit.Assert;
import org.junit.Assume;
@@ -42,9 +42,9 @@ public abstract class RaftExceptionBaseTest<CLUSTER extends
MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
static {
- LogUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
- LogUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
- LogUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
static final int NUM_PEERS = 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 bb1ccfb..cd6a312 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RequestLimitAsyncBaseTest.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RequestLimitAsyncBaseTest.java
@@ -30,7 +30,7 @@ import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.impl.RaftServerImpl;
import org.apache.ratis.server.impl.RaftServerTestUtil;
import org.apache.ratis.statemachine.SimpleStateMachine4Testing;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.junit.Assert;
import org.junit.Test;
@@ -44,8 +44,8 @@ public abstract class RequestLimitAsyncBaseTest<CLUSTER
extends MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
static {
- LogUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
- LogUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.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 1bc9dc1..37d4e99 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RetryCacheTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RetryCacheTests.java
@@ -32,7 +32,7 @@ import org.apache.ratis.server.impl.RaftServerTestUtil;
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.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.apache.ratis.util.TimeDuration;
import org.junit.Assert;
import org.junit.Test;
@@ -46,7 +46,7 @@ public abstract class RetryCacheTests<CLUSTER extends
MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
static {
- LogUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServerImpl.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 ebc5352..a9868ba 100644
--- a/ratis-server/src/test/java/org/apache/ratis/WatchRequestTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/WatchRequestTests.java
@@ -29,7 +29,7 @@ import org.apache.ratis.server.impl.RaftServerImpl;
import org.apache.ratis.server.impl.RaftServerTestUtil;
import org.apache.ratis.statemachine.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.apache.ratis.util.ProtoUtils;
import org.apache.ratis.util.TimeDuration;
import org.apache.ratis.util.function.CheckedConsumer;
@@ -53,7 +53,7 @@ public abstract class WatchRequestTests<CLUSTER extends
MiniRaftCluster>
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
RaftServerTestUtil.setWatchRequestsLogLevel(Level.DEBUG);
- LogUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServerImpl.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 2437bff..e076bb5 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
@@ -23,7 +23,7 @@ import org.apache.ratis.MiniRaftCluster;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.protocol.*;
import org.apache.ratis.proto.RaftProtos.CommitInfoProto;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.junit.Assert;
import org.junit.Test;
@@ -35,8 +35,8 @@ public abstract class GroupInfoBaseTest<CLUSTER extends
MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- LogUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
- LogUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.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 dd8f4a9..0728cb5 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
@@ -29,7 +29,7 @@ import org.apache.ratis.protocol.RaftGroupId;
import org.apache.ratis.protocol.RaftPeer;
import org.apache.ratis.protocol.RaftPeerId;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.apache.ratis.util.function.CheckedBiConsumer;
import org.junit.Assert;
import org.junit.Test;
@@ -50,9 +50,9 @@ public abstract class GroupManagementBaseTest extends
BaseTest {
static final Logger LOG =
LoggerFactory.getLogger(GroupManagementBaseTest.class);
{
- LogUtils.setLogLevel(RaftServerProxy.LOG, Level.DEBUG);
- LogUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
- LogUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServerProxy.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.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 fa09b7d..71c64e3 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
@@ -28,7 +28,7 @@ import org.apache.ratis.server.metrics.RatisMetrics;
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.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.apache.ratis.util.TimeDuration;
import org.apache.ratis.util.Timestamp;
import org.junit.Assert;
@@ -51,8 +51,8 @@ public abstract class LeaderElectionTests<CLUSTER extends
MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- LogUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
- LogUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
@Test
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 81f99fb..4302249 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
@@ -31,7 +31,7 @@ import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.server.storage.RaftStorageTestUtils;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.apache.ratis.util.TimeDuration;
import org.junit.Assert;
import org.junit.Test;
@@ -55,7 +55,7 @@ public abstract class RaftReconfigurationBaseTest<CLUSTER
extends MiniRaftCluste
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
static {
- LogUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
}
private static final DelayLocalExecutionInjection logSyncDelay =
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 2488540..f795952 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
@@ -25,7 +25,7 @@ import org.apache.ratis.protocol.RaftGroupId;
import org.apache.ratis.protocol.RaftPeer;
import org.apache.ratis.protocol.RaftPeerId;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.apache.ratis.util.TimeDuration;
import org.junit.Assert;
import org.slf4j.Logger;
@@ -40,10 +40,10 @@ public class RaftServerTestUtil {
static final Logger LOG = LoggerFactory.getLogger(RaftServerTestUtil.class);
public static void setWatchRequestsLogLevel(Level level) {
- LogUtils.setLogLevel(WatchRequests.LOG, level);
+ Log4jUtils.setLogLevel(WatchRequests.LOG, level);
}
public static void setPendingRequestsLogLevel(Level level) {
- LogUtils.setLogLevel(PendingRequests.LOG, level);
+ Log4jUtils.setLogLevel(PendingRequests.LOG, level);
}
public static void waitAndCheckNewConf(MiniRaftCluster cluster,
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 f89699e..e94b43d 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
@@ -30,7 +30,7 @@ import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.statemachine.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.statemachine.TransactionContext;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.junit.Assert;
import org.junit.Test;
@@ -43,9 +43,9 @@ import static org.junit.Assert.fail;
public abstract class RaftStateMachineExceptionTests<CLUSTER extends
MiniRaftCluster>
extends BaseTest implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- LogUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
- LogUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
- LogUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
private static volatile boolean failPreAppend = false;
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 52931d4..d274952 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
@@ -19,11 +19,11 @@ package org.apache.ratis.server.raftlog.segmented;
import org.apache.log4j.Level;
import org.apache.ratis.protocol.RaftPeerId;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
public interface SegmentedRaftLogTestUtils {
static void setRaftLogWorkerLogLevel(Level level) {
- LogUtils.setLogLevel(SegmentedRaftLogWorker.LOG, level);
+ Log4jUtils.setLogLevel(SegmentedRaftLogWorker.LOG, level);
}
static String getLogFlushTimeMetric(RaftPeerId serverId) {
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 26b2ca1..5dd494f 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
@@ -36,7 +36,7 @@ import org.apache.ratis.proto.RaftProtos.LogEntryProto;
import org.apache.ratis.statemachine.impl.SimpleStateMachineStorage;
import org.apache.ratis.util.FileUtils;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -52,9 +52,9 @@ import java.util.stream.LongStream;
public abstract class RaftSnapshotBaseTest extends BaseTest {
{
- LogUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
- LogUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
- LogUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
static final Logger LOG =
LoggerFactory.getLogger(RaftSnapshotBaseTest.class);
diff --git a/ratis-test/pom.xml b/ratis-test/pom.xml
index 232e4c6..31ebc8f 100644
--- a/ratis-test/pom.xml
+++ b/ratis-test/pom.xml
@@ -77,6 +77,15 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
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 7e1ecb7..8bcdbaf 100644
---
a/ratis-test/src/test/java/org/apache/ratis/TestRaftServerNoLeaderTimeout.java
+++
b/ratis-test/src/test/java/org/apache/ratis/TestRaftServerNoLeaderTimeout.java
@@ -26,7 +26,7 @@ import
org.apache.ratis.server.simulation.MiniRaftClusterWithSimulatedRpc;
import org.apache.ratis.proto.RaftProtos;
import org.apache.ratis.statemachine.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.apache.ratis.util.TimeDuration;
import org.junit.After;
import org.junit.Assert;
@@ -41,8 +41,8 @@ import java.util.concurrent.TimeUnit;
*/
public class TestRaftServerNoLeaderTimeout extends BaseTest {
static {
- LogUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
- LogUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.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 f31a3af..d162191 100644
---
a/ratis-test/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java
+++
b/ratis-test/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java
@@ -28,7 +28,7 @@ import
org.apache.ratis.server.simulation.MiniRaftClusterWithSimulatedRpc;
import org.apache.ratis.proto.RaftProtos;
import org.apache.ratis.statemachine.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.apache.ratis.util.TimeDuration;
import org.junit.After;
import org.junit.Assert;
@@ -51,7 +51,7 @@ import com.codahale.metrics.Gauge;
@Ignore
public class TestRaftServerSlownessDetection extends BaseTest {
static {
- LogUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
}
public static final int NUM_SERVERS = 3;
diff --git
a/ratis-test/src/test/java/org/apache/ratis/grpc/TestGrpcOutputStream.java
b/ratis-test/src/test/java/org/apache/ratis/grpc/TestGrpcOutputStream.java
index 2258a1e..7530767 100644
--- a/ratis-test/src/test/java/org/apache/ratis/grpc/TestGrpcOutputStream.java
+++ b/ratis-test/src/test/java/org/apache/ratis/grpc/TestGrpcOutputStream.java
@@ -23,7 +23,7 @@ import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.grpc.client.GrpcClientStreamer;
import org.apache.ratis.grpc.client.GrpcOutputStream;
import org.apache.ratis.protocol.ClientId;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.apache.ratis.util.SizeInBytes;
import org.junit.Ignore;
@@ -38,7 +38,7 @@ public class TestGrpcOutputStream
extends OutputStreamBaseTest<MiniRaftClusterWithGrpc>
implements MiniRaftClusterWithGrpc.FactoryGet {
static {
- LogUtils.setLogLevel(GrpcClientStreamer.LOG, Level.ALL);
+ Log4jUtils.setLogLevel(GrpcClientStreamer.LOG, Level.ALL);
}
@Override
diff --git
a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftOutputStreamWithGrpc.java
b/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftOutputStreamWithGrpc.java
index 1c4202b..4cc82ee 100644
---
a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftOutputStreamWithGrpc.java
+++
b/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftOutputStreamWithGrpc.java
@@ -20,13 +20,13 @@ package org.apache.ratis.grpc;
import org.apache.log4j.Level;
import org.apache.ratis.OutputStreamBaseTest;
import org.apache.ratis.grpc.client.GrpcClientProtocolService;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
public class TestRaftOutputStreamWithGrpc
extends OutputStreamBaseTest<MiniRaftClusterWithGrpc>
implements MiniRaftClusterWithGrpc.FactoryGet {
{
- LogUtils.setLogLevel(GrpcClientProtocolService.LOG, Level.TRACE);
+ Log4jUtils.setLogLevel(GrpcClientProtocolService.LOG, Level.TRACE);
}
@Override
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 41ac36e..488b523 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
@@ -48,7 +48,7 @@ import org.apache.ratis.server.impl.RaftServerTestUtil;
import org.apache.ratis.server.impl.ServerImplUtils;
import org.apache.ratis.statemachine.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.apache.ratis.util.ProtoUtils;
import org.apache.ratis.util.TimeDuration;
import org.junit.Assert;
@@ -64,8 +64,8 @@ import java.util.concurrent.atomic.AtomicLong;
public class TestRaftServerWithGrpc extends BaseTest implements
MiniRaftClusterWithGrpc.FactoryGet {
{
- LogUtils.setLogLevel(GrpcClientProtocolService.LOG, Level.ALL);
- LogUtils.setLogLevel(GrpcClientProtocolClient.LOG, Level.ALL);
+ Log4jUtils.setLogLevel(GrpcClientProtocolService.LOG, Level.ALL);
+ Log4jUtils.setLogLevel(GrpcClientProtocolClient.LOG, Level.ALL);
}
@Before
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 77e2eda..2861102 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
@@ -23,15 +23,15 @@ import org.apache.ratis.client.RaftClient;
import org.apache.ratis.client.impl.UnorderedAsync;
import org.apache.ratis.grpc.client.GrpcClientProtocolService;
import org.apache.ratis.grpc.client.GrpcClientRpc;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
public class TestWatchRequestWithGrpc
extends WatchRequestTests<MiniRaftClusterWithGrpc>
implements MiniRaftClusterWithGrpc.FactoryGet {
{
- LogUtils.setLogLevel(GrpcClientProtocolService.LOG, Level.ALL);
- LogUtils.setLogLevel(GrpcClientRpc.LOG, Level.ALL);
- LogUtils.setLogLevel(UnorderedAsync.LOG, Level.ALL);
- LogUtils.setLogLevel(RaftClient.LOG, Level.ALL);
+ Log4jUtils.setLogLevel(GrpcClientProtocolService.LOG, Level.ALL);
+ Log4jUtils.setLogLevel(GrpcClientRpc.LOG, Level.ALL);
+ Log4jUtils.setLogLevel(UnorderedAsync.LOG, Level.ALL);
+ Log4jUtils.setLogLevel(RaftClient.LOG, Level.ALL);
}
}
\ 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 d39723d..d420709 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
@@ -45,7 +45,7 @@ import
org.apache.ratis.statemachine.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.util.FileUtils;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.apache.ratis.util.Preconditions;
import org.apache.ratis.util.SizeInBytes;
import org.apache.ratis.util.StringUtils;
@@ -74,7 +74,7 @@ public abstract class ServerRestartTests<CLUSTER extends
MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- LogUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
}
static final int NUM_SERVERS = 3;
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 53cb364..3764adf 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
@@ -41,9 +41,9 @@ import
org.apache.ratis.statemachine.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.FileUtils;
import org.apache.ratis.util.JavaUtils;
-import org.apache.ratis.util.LogUtils;
import org.apache.ratis.util.SizeInBytes;
import org.apache.ratis.util.TimeDuration;
import org.junit.After;
@@ -73,9 +73,9 @@ import com.codahale.metrics.Timer;
public class TestSegmentedRaftLog extends BaseTest {
static {
- LogUtils.setLogLevel(SegmentedRaftLogWorker.LOG, Level.DEBUG);
- LogUtils.setLogLevel(SegmentedRaftLogCache.LOG, Level.TRACE);
- LogUtils.setLogLevel(SegmentedRaftLog.LOG, Level.TRACE);
+ Log4jUtils.setLogLevel(SegmentedRaftLogWorker.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(SegmentedRaftLogCache.LOG, Level.TRACE);
+ Log4jUtils.setLogLevel(SegmentedRaftLog.LOG, Level.TRACE);
}
public static long getOpenSegmentSize(RaftLog raftLog) {
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 1e55da4..174ba8c 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
@@ -35,10 +35,9 @@ import org.apache.ratis.server.impl.RaftServerImpl;
import org.apache.ratis.server.impl.RaftServerProxy;
import org.apache.ratis.server.impl.RaftServerTestUtil;
import org.apache.ratis.server.simulation.MiniRaftClusterWithSimulatedRpc;
-import org.apache.ratis.util.LogUtils;
+import org.apache.ratis.util.Log4jUtils;
import org.junit.*;
-import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -57,8 +56,8 @@ import static org.junit.Assert.*;
*/
public class TestStateMachine extends BaseTest implements
MiniRaftClusterWithSimulatedRpc.FactoryGet {
static {
- LogUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
- LogUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
public static final int NUM_SERVERS = 3;
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 54526fe..dbe0e94 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
@@ -28,7 +28,7 @@ import java.util.function.Consumer;
public class TestTimeoutScheduler extends BaseTest {
{
- LogUtils.setLogLevel(TimeoutScheduler.LOG, Level.ALL);
+ Log4jUtils.setLogLevel(TimeoutScheduler.LOG, Level.ALL);
}
static class ErrorHandler implements Consumer<RuntimeException> {
