You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ratis.apache.org by ru...@apache.org on 2020/11/26 07:41:23 UTC
[incubator-ratis] branch master updated: RATIS-1182. Move
RaftServerProxy/RaftServerImpl LOG to RaftServer. (#301)
This is an automated email from the ASF dual-hosted git repository.
runzhiwang 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 bc9d761 RATIS-1182. Move RaftServerProxy/RaftServerImpl LOG to RaftServer. (#301)
bc9d761 is described below
commit bc9d7615d8ffa30e79a36b9fd1950af38f0f6a49
Author: Tsz-Wo Nicholas Sze <sz...@apache.org>
AuthorDate: Thu Nov 26 15:41:13 2020 +0800
RATIS-1182. Move RaftServerProxy/RaftServerImpl LOG to RaftServer. (#301)
---
.../src/test/java/org/apache/ratis/TestMultiRaftGroup.java | 4 ++--
.../ratis/examples/arithmetic/TestArithmeticLogDump.java | 5 +++--
.../src/main/java/org/apache/ratis/server/RaftServer.java | 6 ++++++
.../main/java/org/apache/ratis/server/impl/LeaderState.java | 4 ++--
.../main/java/org/apache/ratis/server/impl/RaftServerImpl.java | 10 ++--------
.../java/org/apache/ratis/server/impl/RaftServerProxy.java | 4 ----
.../java/org/apache/ratis/server/impl/ServerImplUtils.java | 5 +++--
.../main/java/org/apache/ratis/server/impl/ServerState.java | 2 +-
.../src/test/java/org/apache/ratis/MessageStreamApiTests.java | 4 ++--
.../src/test/java/org/apache/ratis/RaftAsyncTests.java | 3 ++-
.../src/test/java/org/apache/ratis/RaftBasicTests.java | 2 +-
.../src/test/java/org/apache/ratis/RaftExceptionBaseTest.java | 4 ++--
.../test/java/org/apache/ratis/RequestLimitAsyncBaseTest.java | 3 ++-
.../src/test/java/org/apache/ratis/RetryCacheTests.java | 3 ++-
.../src/test/java/org/apache/ratis/WatchRequestTests.java | 3 ++-
.../java/org/apache/ratis/server/impl/GroupInfoBaseTest.java | 3 ++-
.../org/apache/ratis/server/impl/GroupManagementBaseTest.java | 5 +++--
.../java/org/apache/ratis/server/impl/LeaderElectionTests.java | 3 ++-
.../apache/ratis/server/impl/RaftReconfigurationBaseTest.java | 3 ++-
.../ratis/server/impl/RaftStateMachineExceptionTests.java | 3 ++-
.../apache/ratis/server/impl/TestRatisServerMetricsBase.java | 5 +++--
.../org/apache/ratis/statemachine/RaftSnapshotBaseTest.java | 3 ++-
.../java/org/apache/ratis/TestRaftServerNoLeaderTimeout.java | 3 ++-
.../java/org/apache/ratis/TestRaftServerSlownessDetection.java | 5 +++--
.../java/org/apache/ratis/statemachine/TestStateMachine.java | 3 ++-
25 files changed, 55 insertions(+), 43 deletions(-)
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 a6e8bfd..6635176 100644
--- a/ratis-examples/src/test/java/org/apache/ratis/TestMultiRaftGroup.java
+++ b/ratis-examples/src/test/java/org/apache/ratis/TestMultiRaftGroup.java
@@ -24,8 +24,8 @@ import org.apache.ratis.examples.ParameterizedBaseTest;
import org.apache.ratis.examples.arithmetic.ArithmeticStateMachine;
import org.apache.ratis.examples.arithmetic.TestArithmetic;
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.RaftServerImpl;
import org.apache.ratis.util.Log4jUtils;
import org.apache.ratis.util.function.CheckedBiConsumer;
import org.junit.Test;
@@ -39,7 +39,7 @@ import java.util.concurrent.atomic.AtomicInteger;
@RunWith(Parameterized.class)
public class TestMultiRaftGroup extends BaseTest {
static {
- Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServer.Division.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 9a547aa..604d05d 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
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -26,6 +26,7 @@ import org.apache.ratis.BaseTest;
import org.apache.ratis.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.conf.RaftProperties;
+import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.impl.RaftServerImpl;
import org.apache.ratis.server.simulation.MiniRaftClusterWithSimulatedRpc;
@@ -42,7 +43,7 @@ import org.junit.Test;
public class TestArithmeticLogDump extends BaseTest {
static {
- Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
}
public static final int NUM_SERVERS = 1;
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/RaftServer.java b/ratis-server/src/main/java/org/apache/ratis/server/RaftServer.java
index e8f42c1..fc8b8ab 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/RaftServer.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/RaftServer.java
@@ -27,6 +27,8 @@ import org.apache.ratis.server.protocol.RaftServerAsynchronousProtocol;
import org.apache.ratis.server.protocol.RaftServerProtocol;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.util.LifeCycle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.Closeable;
import java.io.IOException;
@@ -37,8 +39,12 @@ public interface RaftServer extends Closeable, RpcType.Get,
RaftServerProtocol, RaftServerAsynchronousProtocol,
RaftClientProtocol, RaftClientAsynchronousProtocol,
AdminProtocol, AdminAsynchronousProtocol {
+ Logger LOG = LoggerFactory.getLogger(RaftServer.class);
+
/** A division of a {@link RaftServer} for a particular group. */
interface Division {
+ Logger LOG = LoggerFactory.getLogger(Division.class);
+
/** @return the {@link RaftGroupMemberId} for this division. */
RaftGroupMemberId getMemberId();
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderState.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderState.java
index e30d480..176961c 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderState.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderState.java
@@ -34,7 +34,6 @@ import org.apache.ratis.proto.RaftProtos.LogEntryProto;
import org.apache.ratis.server.raftlog.RaftLogIOException;
import org.apache.ratis.statemachine.TransactionContext;
import org.apache.ratis.util.*;
-import org.slf4j.Logger;
import java.io.IOException;
import java.util.*;
@@ -52,6 +51,8 @@ import java.util.function.ToLongFunction;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import static org.apache.ratis.server.RaftServer.Division.LOG;
+
/**
* States for leader only. It contains three different types of processors:
* 1. RPC senders: each thread is appending log to a follower
@@ -61,7 +62,6 @@ import java.util.stream.Stream;
* corresponding log entries are committed
*/
public class LeaderState {
- private static final Logger LOG = RaftServerImpl.LOG;
public static final String APPEND_PLACEHOLDER = JavaUtils.getClassSimpleName(LeaderState.class) + ".placeholder";
private enum BootStrapProgress {
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
index 73ad4fc..14a6e60 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
@@ -47,8 +47,6 @@ import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.statemachine.TransactionContext;
import org.apache.ratis.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.ratis.util.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.management.ObjectName;
import java.io.File;
@@ -81,8 +79,6 @@ import com.codahale.metrics.Timer;
public class RaftServerImpl implements RaftServer.Division,
RaftServerProtocol, RaftServerAsynchronousProtocol,
RaftClientProtocol, RaftClientAsynchronousProtocol {
- public static final Logger LOG = LoggerFactory.getLogger(RaftServerImpl.class);
-
private static final String CLASS_NAME = JavaUtils.getClassSimpleName(RaftServerImpl.class);
static final String REQUEST_VOTE = CLASS_NAME + ".requestVote";
static final String APPEND_ENTRIES = CLASS_NAME + ".appendEntries";
@@ -112,14 +108,14 @@ public class RaftServerImpl implements RaftServer.Division,
private final LeaderElectionMetrics leaderElectionMetrics;
private final RaftServerMetrics raftServerMetrics;
- private AtomicReference<TermIndex> inProgressInstallSnapshotRequest;
+ private final AtomicReference<TermIndex> inProgressInstallSnapshotRequest;
// To avoid append entry before complete start() method
// For example, if thread1 start(), but before thread1 startAsFollower(), thread2 receive append entry
// request, and change state to RUNNING by lifeCycle.compareAndTransition(STARTING, RUNNING),
// then thread1 execute lifeCycle.transition(RUNNING) in startAsFollower(),
// So happens IllegalStateException: ILLEGAL TRANSITION: RUNNING -> RUNNING,
- private AtomicBoolean startComplete;
+ private final AtomicBoolean startComplete;
RaftServerImpl(RaftGroup group, StateMachine stateMachine, RaftServerProxy proxy) throws IOException {
final RaftPeerId id = proxy.getId();
@@ -297,8 +293,6 @@ public class RaftServerImpl implements RaftServer.Division,
* the directory is moved to
* {@link RaftServerConfigKeys#REMOVED_GROUPS_DIR_KEY} location.
* If the deleteDirectory flag is true, the group is permanently deleted.
- * @param deleteDirectory
- * @param renameDirectory
*/
void groupRemove(boolean deleteDirectory, boolean renameDirectory) {
final RaftStorageDirectory dir = state.getStorage().getStorageDir();
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java
index ed0c2ca..0247211 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java
@@ -45,8 +45,6 @@ import org.apache.ratis.util.LifeCycle;
import org.apache.ratis.util.Preconditions;
import org.apache.ratis.util.ProtoUtils;
import org.apache.ratis.util.function.CheckedFunction;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.Closeable;
import java.io.File;
@@ -64,8 +62,6 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
public class RaftServerProxy implements RaftServer {
- public static final Logger LOG = LoggerFactory.getLogger(RaftServerProxy.class);
-
/**
* A map: {@link RaftGroupId} -> {@link RaftServerImpl} futures.
*
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerImplUtils.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerImplUtils.java
index f70ebc1..4206a5b 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerImplUtils.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerImplUtils.java
@@ -21,6 +21,7 @@ import org.apache.ratis.conf.Parameters;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.protocol.RaftGroup;
import org.apache.ratis.protocol.RaftPeerId;
+import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.protocol.TermIndex;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.util.IOUtils;
@@ -39,7 +40,7 @@ public final class ServerImplUtils {
public static RaftServerProxy newRaftServer(
RaftPeerId id, RaftGroup group, StateMachine.Registry stateMachineRegistry,
RaftProperties properties, Parameters parameters) throws IOException {
- RaftServerProxy.LOG.debug("newRaftServer: {}, {}", id, group);
+ RaftServer.LOG.debug("newRaftServer: {}, {}", id, group);
final RaftServerProxy proxy = newRaftServer(id, stateMachineRegistry, properties, parameters);
proxy.initGroups(group);
return proxy;
@@ -54,7 +55,7 @@ public final class ServerImplUtils {
// attempt multiple times to avoid temporary bind exception
proxy = JavaUtils.attemptRepeatedly(
() -> new RaftServerProxy(id, stateMachineRegistry, properties, parameters),
- 5, sleepTime, "new RaftServerProxy", RaftServerProxy.LOG);
+ 5, sleepTime, "new RaftServerProxy", RaftServer.LOG);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
throw IOUtils.toInterruptedIOException(
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java
index bb64866..4dfaf5c 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java
@@ -49,7 +49,7 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
-import static org.apache.ratis.server.impl.RaftServerImpl.LOG;
+import static org.apache.ratis.server.RaftServer.Division.LOG;
/**
* Common states of a raft peer. Protected by RaftServer's lock.
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 f37035c..ba5719c 100644
--- a/ratis-server/src/test/java/org/apache/ratis/MessageStreamApiTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/MessageStreamApiTests.java
@@ -25,7 +25,7 @@ import org.apache.ratis.client.api.MessageOutputStream;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.protocol.Message;
import org.apache.ratis.protocol.RaftClientReply;
-import org.apache.ratis.server.impl.RaftServerImpl;
+import org.apache.ratis.server.RaftServer;
import org.apache.ratis.statemachine.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
@@ -39,7 +39,7 @@ import java.nio.charset.StandardCharsets;
public abstract class MessageStreamApiTests<CLUSTER extends MiniRaftCluster> extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
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 2fd669c..fd37db6 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RaftAsyncTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RaftAsyncTests.java
@@ -35,6 +35,7 @@ import org.apache.ratis.protocol.exceptions.StateMachineException;
import org.apache.ratis.retry.RetryPolicies;
import org.apache.ratis.retry.RetryPolicies.RetryLimited;
import org.apache.ratis.retry.RetryPolicy;
+import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.impl.DelayLocalExecutionInjection;
import org.apache.ratis.server.impl.RaftServerImpl;
@@ -67,7 +68,7 @@ import static org.apache.ratis.RaftTestUtil.waitForLeader;
public abstract class RaftAsyncTests<CLUSTER extends MiniRaftCluster> extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
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 0568f73..1fcc583 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java
@@ -70,7 +70,7 @@ public abstract class RaftBasicTests<CLUSTER extends MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServer.Division.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 bebf940..6adb65e 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RaftExceptionBaseTest.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RaftExceptionBaseTest.java
@@ -26,8 +26,8 @@ import org.apache.ratis.protocol.exceptions.GroupMismatchException;
import org.apache.ratis.protocol.exceptions.NotLeaderException;
import org.apache.ratis.protocol.exceptions.StaleReadException;
import org.apache.ratis.protocol.exceptions.StateMachineException;
+import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
-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;
@@ -46,7 +46,7 @@ public abstract class RaftExceptionBaseTest<CLUSTER extends MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
static {
- Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
Log4jUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
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 a1084f8..5328873 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RequestLimitAsyncBaseTest.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RequestLimitAsyncBaseTest.java
@@ -26,6 +26,7 @@ import org.apache.ratis.proto.RaftProtos.ReplicationLevel;
import org.apache.ratis.protocol.RaftClientReply;
import org.apache.ratis.protocol.exceptions.ResourceUnavailableException;
import org.apache.ratis.retry.RetryPolicies;
+import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.impl.RaftServerImpl;
import org.apache.ratis.server.impl.RaftServerTestUtil;
@@ -44,7 +45,7 @@ public abstract class RequestLimitAsyncBaseTest<CLUSTER extends MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
static {
- Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServer.Division.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 44046fc..8185ba7 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RetryCacheTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RetryCacheTests.java
@@ -27,6 +27,7 @@ import org.apache.ratis.protocol.RaftClientReply;
import org.apache.ratis.protocol.RaftClientRequest;
import org.apache.ratis.protocol.RaftPeer;
import org.apache.ratis.protocol.RaftPeerId;
+import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.impl.RaftServerImpl;
import org.apache.ratis.server.impl.RaftServerTestUtil;
import org.apache.ratis.server.raftlog.RaftLog;
@@ -46,7 +47,7 @@ public abstract class RetryCacheTests<CLUSTER extends MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
static {
- Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.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 47f11a8..1928915 100644
--- a/ratis-server/src/test/java/org/apache/ratis/WatchRequestTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/WatchRequestTests.java
@@ -30,6 +30,7 @@ import org.apache.ratis.protocol.exceptions.RaftRetryFailureException;
import org.apache.ratis.protocol.exceptions.TimeoutIOException;
import org.apache.ratis.retry.RetryPolicies;
import org.apache.ratis.retry.RetryPolicy;
+import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.impl.RaftServerImpl;
import org.apache.ratis.server.impl.RaftServerTestUtil;
@@ -61,7 +62,7 @@ public abstract class WatchRequestTests<CLUSTER extends MiniRaftCluster>
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
RaftServerTestUtil.setWatchRequestsLogLevel(Level.DEBUG);
- Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.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 0e563eb..055cc95 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
@@ -24,6 +24,7 @@ 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.junit.Assert;
import org.junit.Test;
@@ -36,7 +37,7 @@ public abstract class GroupInfoBaseTest<CLUSTER extends MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
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 55a7051..4dd543a 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
@@ -30,6 +30,7 @@ import org.apache.ratis.protocol.RaftGroup;
import org.apache.ratis.protocol.RaftGroupId;
import org.apache.ratis.protocol.RaftPeer;
import org.apache.ratis.protocol.RaftPeerId;
+import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.util.FileUtils;
import org.apache.ratis.util.JavaUtils;
@@ -58,8 +59,8 @@ public abstract class GroupManagementBaseTest extends BaseTest {
static final Logger LOG = LoggerFactory.getLogger(GroupManagementBaseTest.class);
{
- Log4jUtils.setLogLevel(RaftServerProxy.LOG, Level.DEBUG);
- Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServer.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
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 b76b057..2988baa 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
@@ -27,6 +27,7 @@ import org.apache.ratis.protocol.RaftClientReply;
import org.apache.ratis.protocol.RaftGroupId;
import org.apache.ratis.protocol.RaftGroupMemberId;
import org.apache.ratis.protocol.RaftPeerId;
+import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.metrics.LeaderElectionMetrics;
import org.apache.ratis.server.raftlog.segmented.SegmentedRaftLogTestUtils;
import org.apache.ratis.util.ExitUtils;
@@ -62,7 +63,7 @@ public abstract class LeaderElectionTests<CLUSTER extends MiniRaftCluster>
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
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 2238d8b..fdf8971 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
@@ -30,6 +30,7 @@ import org.apache.ratis.protocol.*;
import org.apache.ratis.protocol.exceptions.LeaderNotReadyException;
import org.apache.ratis.protocol.exceptions.ReconfigurationInProgressException;
import org.apache.ratis.protocol.exceptions.ReconfigurationTimeoutException;
+import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.server.storage.RaftStorageTestUtils;
@@ -59,7 +60,7 @@ public abstract class RaftReconfigurationBaseTest<CLUSTER extends MiniRaftCluste
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
static {
- Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
}
private static final DelayLocalExecutionInjection logSyncDelay =
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 7406c44..dc6171e 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
@@ -27,6 +27,7 @@ import org.apache.ratis.client.RaftClientRpc;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.protocol.*;
import org.apache.ratis.protocol.exceptions.StateMachineException;
+import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.statemachine.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
@@ -45,7 +46,7 @@ import static org.junit.Assert.fail;
public abstract class RaftStateMachineExceptionTests<CLUSTER extends MiniRaftCluster>
extends BaseTest implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
Log4jUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
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 1ae94c9..9a3380b 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
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -32,6 +32,7 @@ import org.apache.ratis.protocol.ClientId;
import org.apache.ratis.protocol.Message;
import org.apache.ratis.protocol.RaftClientReply;
import org.apache.ratis.protocol.RaftClientRequest;
+import org.apache.ratis.server.RaftServer;
import org.apache.ratis.util.Log4jUtils;
import org.junit.Assert;
import org.junit.Test;
@@ -41,7 +42,7 @@ public abstract class TestRatisServerMetricsBase<CLUSTER extends MiniRaftCluster
extends BaseTest
implements MiniRaftCluster.Factory.Get<CLUSTER> {
{
- Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
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 1945e91..03a186b 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
@@ -35,6 +35,7 @@ import org.apache.ratis.metrics.MetricRegistryInfo;
import org.apache.ratis.metrics.RatisMetricRegistry;
import org.apache.ratis.protocol.RaftClientReply;
import org.apache.ratis.protocol.RaftPeerId;
+import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.impl.RaftServerImpl;
import org.apache.ratis.server.impl.RaftServerTestUtil;
@@ -66,7 +67,7 @@ import com.codahale.metrics.Timer;
public abstract class RaftSnapshotBaseTest extends BaseTest {
{
- Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
Log4jUtils.setLogLevel(RaftLog.LOG, Level.DEBUG);
Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
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 8bcdbaf..6d497e8 100644
--- a/ratis-test/src/test/java/org/apache/ratis/TestRaftServerNoLeaderTimeout.java
+++ b/ratis-test/src/test/java/org/apache/ratis/TestRaftServerNoLeaderTimeout.java
@@ -20,6 +20,7 @@ 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;
import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.impl.RaftServerImpl;
import org.apache.ratis.server.simulation.MiniRaftClusterWithSimulatedRpc;
@@ -41,7 +42,7 @@ import java.util.concurrent.TimeUnit;
*/
public class TestRaftServerNoLeaderTimeout extends BaseTest {
static {
- Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}
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 e3152ad..5be8c78 100644
--- a/ratis-test/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java
+++ b/ratis-test/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -21,6 +21,7 @@ import org.apache.log4j.Level;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.metrics.RatisMetricRegistry;
import org.apache.ratis.protocol.RaftPeerId;
+import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.impl.RaftServerImpl;
import org.apache.ratis.server.impl.RaftServerMetrics;
@@ -51,7 +52,7 @@ import com.codahale.metrics.Gauge;
@Ignore
public class TestRaftServerSlownessDetection extends BaseTest {
static {
- Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
}
public static final int NUM_SERVERS = 3;
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 2965a2d..027f1fc 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
@@ -30,6 +30,7 @@ import org.apache.ratis.protocol.RaftGroup;
import org.apache.ratis.protocol.RaftGroupId;
import org.apache.ratis.protocol.RaftPeer;
import org.apache.ratis.protocol.RaftPeerId;
+import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.impl.RaftServerImpl;
import org.apache.ratis.server.impl.RaftServerProxy;
@@ -56,7 +57,7 @@ import static org.junit.Assert.*;
*/
public class TestStateMachine extends BaseTest implements MiniRaftClusterWithSimulatedRpc.FactoryGet {
static {
- Log4jUtils.setLogLevel(RaftServerImpl.LOG, Level.DEBUG);
+ Log4jUtils.setLogLevel(RaftServer.Division.LOG, Level.DEBUG);
Log4jUtils.setLogLevel(RaftClient.LOG, Level.DEBUG);
}