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/ratis.git
The following commit(s) were added to refs/heads/master by this push:
new 9cfd1bf71 RATIS-2091. Fix other checkstyle issues in test-directory
(#1094)
9cfd1bf71 is described below
commit 9cfd1bf71f523262928cbe09685696ae71dab8e7
Author: Symious <[email protected]>
AuthorDate: Thu May 16 11:30:23 2024 +0800
RATIS-2091. Fix other checkstyle issues in test-directory (#1094)
---
.../ratis/examples/arithmetic/TestArithmetic.java | 3 +-
.../ratis/examples/filestore/FileStoreWriter.java | 2 +-
.../TestFileStoreStreamingWithGrpcCluster.java | 3 +-
.../ratis/metrics/TestMetricRegistriesLoader.java | 2 +-
.../ratis/InstallSnapshotFromLeaderTests.java | 9 ++-
.../test/java/org/apache/ratis/RaftBasicTests.java | 60 ++++++++--------
.../test/java/org/apache/ratis/RaftTestUtil.java | 3 +-
.../java/org/apache/ratis/RetryCacheTests.java | 3 +-
.../java/org/apache/ratis/WatchRequestTests.java | 69 +++++++++---------
.../server/impl/BlockRequestHandlingInjection.java | 2 +-
.../ratis/server/impl/LeaderElectionTests.java | 14 ++--
.../apache/ratis/server/impl/MiniRaftCluster.java | 84 +++++++++++-----------
.../ratis/server/impl/RaftServerTestUtil.java | 8 ++-
.../ratis/server/impl/RetryCacheTestUtil.java | 6 +-
.../ratis/server/impl/TestLogAppenderMetrics.java | 8 +--
.../MiniRaftClusterWithSimulatedRpc.java | 2 +-
.../impl/SimpleStateMachine4Testing.java | 6 +-
.../datastream/DataStreamAsyncClusterTests.java | 9 ++-
.../ratis/datastream/DataStreamBaseTest.java | 22 +++---
.../ratis/datastream/DataStreamTestUtils.java | 3 +-
...usterWithRpcTypeGrpcAndDataStreamTypeNetty.java | 9 +--
...sterWithRpcTypeNettyAndDataStreamTypeNetty.java | 5 +-
...amSslWithRpcTypeGrpcAndDataStreamTypeNetty.java | 8 +--
.../datastream/TestNettyDataStreamWithMock.java | 4 +-
.../apache/ratis/grpc/TestGrpcMessageMetrics.java | 6 +-
.../apache/ratis/grpc/TestRaftServerWithGrpc.java | 2 +-
.../apache/ratis/grpc/TestRetryCacheWithGrpc.java | 3 +-
.../apache/ratis/server/ServerRestartTests.java | 9 +--
.../ratis/server/impl/TestRaftConfiguration.java | 4 +-
.../ratis/server/impl/TestRaftServerJmx.java | 29 +++++---
.../ratis/server/raftlog/TestRaftLogMetrics.java | 15 ++--
.../segmented/TestBufferedWriteChannel.java | 14 ++--
.../server/raftlog/segmented/TestLogSegment.java | 3 +-
.../raftlog/segmented/TestSegmentedRaftLog.java | 18 +++--
.../shell/cli/sh/LocalCommandIntegrationTest.java | 10 +--
.../java/org/apache/ratis/util/TestLifeCycle.java | 3 +-
.../java/org/apache/ratis/util/TestMinMax.java | 3 +-
37 files changed, 262 insertions(+), 201 deletions(-)
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 0c56898f0..3d9d89a7d 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
@@ -107,7 +107,8 @@ public class TestArithmetic extends ParameterizedBaseTest {
final Variable p0 = new Variable("p" + i_1);
final Variable a1 = defineVariable(client, "a"+i,
DIV.apply(ADD.apply(a0, b0), 2));
final Variable b1 = defineVariable(client, "b"+i,
SQRT.apply(MULT.apply(a0, b0)));
- final Variable t1 = defineVariable(client, "t"+i, SUBTRACT.apply(t0,
MULT.apply(p0, SQUARE.apply(SUBTRACT.apply(a0, a1)))));
+ final Variable t1 = defineVariable(client, "t"+i,
+ SUBTRACT.apply(t0, MULT.apply(p0, SQUARE.apply(SUBTRACT.apply(a0,
a1)))));
final Variable p1 = defineVariable(client, "p"+i, MULT.apply(2, p0));
final Variable pi_i = new Variable("pi_"+i);
diff --git
a/ratis-examples/src/test/java/org/apache/ratis/examples/filestore/FileStoreWriter.java
b/ratis-examples/src/test/java/org/apache/ratis/examples/filestore/FileStoreWriter.java
index dbffab8a7..c2b52fa63 100644
---
a/ratis-examples/src/test/java/org/apache/ratis/examples/filestore/FileStoreWriter.java
+++
b/ratis-examples/src/test/java/org/apache/ratis/examples/filestore/FileStoreWriter.java
@@ -44,7 +44,7 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicInteger;
-class FileStoreWriter implements Closeable {
+final class FileStoreWriter implements Closeable {
public static final Logger LOG =
LoggerFactory.getLogger(FileStoreWriter.class);
final long seed = ThreadLocalRandom.current().nextLong();
diff --git
a/ratis-examples/src/test/java/org/apache/ratis/examples/filestore/TestFileStoreStreamingWithGrpcCluster.java
b/ratis-examples/src/test/java/org/apache/ratis/examples/filestore/TestFileStoreStreamingWithGrpcCluster.java
index a6f112760..a5106444c 100644
---
a/ratis-examples/src/test/java/org/apache/ratis/examples/filestore/TestFileStoreStreamingWithGrpcCluster.java
+++
b/ratis-examples/src/test/java/org/apache/ratis/examples/filestore/TestFileStoreStreamingWithGrpcCluster.java
@@ -19,7 +19,8 @@ package org.apache.ratis.examples.filestore;
import
org.apache.ratis.datastream.MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty;
-public class TestFileStoreStreamingWithGrpcCluster extends
FileStoreStreamingBaseTest<MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty>
+public class TestFileStoreStreamingWithGrpcCluster
+ extends
FileStoreStreamingBaseTest<MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty>
implements MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty.FactoryGet
{
}
diff --git
a/ratis-metrics-default/src/test/java/org/apache/ratis/metrics/TestMetricRegistriesLoader.java
b/ratis-metrics-default/src/test/java/org/apache/ratis/metrics/TestMetricRegistriesLoader.java
index c7f26740d..cefc6b794 100644
---
a/ratis-metrics-default/src/test/java/org/apache/ratis/metrics/TestMetricRegistriesLoader.java
+++
b/ratis-metrics-default/src/test/java/org/apache/ratis/metrics/TestMetricRegistriesLoader.java
@@ -67,7 +67,7 @@ public class TestMetricRegistriesLoader {
Consumer<RatisMetricRegistry> reporter = v-> cntr.incrementAndGet();
Consumer<RatisMetricRegistry> stopReporter = v-> cntr.incrementAndGet();
r.addReporterRegistration(reporter, stopReporter);
-
+
// check if add and remove of metric do reporting counter increase
MetricRegistryInfo info = new MetricRegistryInfo("t1", "t1", "t1", "t1");
r.create(info);
diff --git
a/ratis-server/src/test/java/org/apache/ratis/InstallSnapshotFromLeaderTests.java
b/ratis-server/src/test/java/org/apache/ratis/InstallSnapshotFromLeaderTests.java
index 9d6a2f183..46cfebbd1 100644
---
a/ratis-server/src/test/java/org/apache/ratis/InstallSnapshotFromLeaderTests.java
+++
b/ratis-server/src/test/java/org/apache/ratis/InstallSnapshotFromLeaderTests.java
@@ -134,7 +134,8 @@ public abstract class
InstallSnapshotFromLeaderTests<CLUSTER extends MiniRaftClu
File file2;
@Override
- public synchronized void initialize(RaftServer server, RaftGroupId
groupId, RaftStorage raftStorage) throws IOException {
+ public synchronized void initialize(RaftServer server, RaftGroupId
groupId, RaftStorage raftStorage)
+ throws IOException {
super.initialize(server, groupId, raftStorage);
// contains two snapshot files
@@ -215,7 +216,8 @@ public abstract class
InstallSnapshotFromLeaderTests<CLUSTER extends MiniRaftClu
private File tmpDir;
@Override
- public synchronized void initialize(RaftServer server, RaftGroupId
groupId, RaftStorage raftStorage) throws IOException {
+ public synchronized void initialize(RaftServer server, RaftGroupId
groupId, RaftStorage raftStorage)
+ throws IOException {
super.initialize(server, groupId, raftStorage);
this.root = new File("/tmp/ratis-tests/statemachine/" +
getId().toString());
this.snapshotDir = new File(root, "snapshot");
@@ -238,7 +240,8 @@ public abstract class
InstallSnapshotFromLeaderTests<CLUSTER extends MiniRaftClu
public long takeSnapshot() {
final TermIndex lastApplied = getLastAppliedTermIndex();
final File snapshotTmpDir = new File(tmpDir,
UUID.randomUUID().toString());
- final File snapshotRealDir = new File(snapshotDir,
String.format("%d_%d", lastApplied.getTerm(), lastApplied.getIndex()));
+ final File snapshotRealDir = new File(snapshotDir,
+ String.format("%d_%d", lastApplied.getTerm(),
lastApplied.getIndex()));
try {
FileUtils.deleteFully(snapshotRealDir);
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 9f360cb51..b16905d9a 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java
@@ -96,27 +96,27 @@ public abstract class RaftBasicTests<CLUSTER extends
MiniRaftCluster>
}
static CompletableFuture<Void> killAndRestartServer(
- RaftPeerId id, long killSleepMs, long restartSleepMs, MiniRaftCluster
cluster, Logger LOG) {
+ RaftPeerId id, long killSleepMs, long restartSleepMs, MiniRaftCluster
cluster, Logger log) {
final CompletableFuture<Void> future = new CompletableFuture<>();
new Thread(() -> {
try {
Thread.sleep(killSleepMs);
cluster.killServer(id);
Thread.sleep(restartSleepMs);
- LOG.info("restart server: " + id);
+ log.info("restart server: " + id);
cluster.restartServer(id, false);
future.complete(null);
} catch (Exception e) {
- ExitUtils.terminate(-1, "Failed to kill/restart server: " + id, e,
LOG);
+ ExitUtils.terminate(-1, "Failed to kill/restart server: " + id, e,
log);
}
}).start();
return future;
}
static void runTestBasicAppendEntries(
- boolean async, boolean killLeader, int numMessages, MiniRaftCluster
cluster, Logger LOG)
+ boolean async, boolean killLeader, int numMessages, MiniRaftCluster
cluster, Logger log)
throws Exception {
- LOG.info("runTestBasicAppendEntries: async? {}, killLeader={},
numMessages={}",
+ log.info("runTestBasicAppendEntries: async? {}, killLeader={},
numMessages={}",
async, killLeader, numMessages);
for (RaftServer s : cluster.getServers()) {
cluster.restartServer(s.getId(), false);
@@ -125,16 +125,16 @@ public abstract class RaftBasicTests<CLUSTER extends
MiniRaftCluster>
final long term = leader.getInfo().getCurrentTerm();
final CompletableFuture<Void> killAndRestartFollower =
killAndRestartServer(
- cluster.getFollowers().get(0).getId(), 0, 1000, cluster, LOG);
+ cluster.getFollowers().get(0).getId(), 0, 1000, cluster, log);
final CompletableFuture<Void> killAndRestartLeader;
if (killLeader) {
- LOG.info("killAndRestart leader " + leader.getId());
- killAndRestartLeader = killAndRestartServer(leader.getId(), 2000, 4000,
cluster, LOG);
+ log.info("killAndRestart leader " + leader.getId());
+ killAndRestartLeader = killAndRestartServer(leader.getId(), 2000, 4000,
cluster, log);
} else {
killAndRestartLeader = CompletableFuture.completedFuture(null);
}
- LOG.info(cluster.printServers());
+ log.info(cluster.printServers());
final SimpleMessage[] messages = SimpleMessage.create(numMessages);
@@ -163,14 +163,14 @@ public abstract class RaftBasicTests<CLUSTER extends
MiniRaftCluster>
}
}
Thread.sleep(cluster.getTimeoutMax().toIntExact(TimeUnit.MILLISECONDS) +
100);
- LOG.info(cluster.printAllLogs());
+ log.info(cluster.printAllLogs());
killAndRestartFollower.join();
killAndRestartLeader.join();
final List<RaftServer.Division> divisions =
cluster.getServerAliveStream().collect(Collectors.toList());
for(RaftServer.Division impl: divisions) {
- RaftTestUtil.assertLogEntries(impl, term, messages, 50, LOG);
+ RaftTestUtil.assertLogEntries(impl, term, messages, 50, log);
}
}
@@ -271,16 +271,16 @@ public abstract class RaftBasicTests<CLUSTER extends
MiniRaftCluster>
final AtomicReference<Throwable> exceptionInClientThread = new
AtomicReference<>();
final MiniRaftCluster cluster;
- final Logger LOG;
+ final Logger log;
Client4TestWithLoad(int index, int numMessages, boolean useAsync,
- MiniRaftCluster cluster, Logger LOG) {
+ MiniRaftCluster cluster, Logger log) {
super("client-" + index);
this.index = index;
this.messages = SimpleMessage.create(numMessages, index + "-");
this.useAsync = useAsync;
this.cluster = cluster;
- this.LOG = LOG;
+ this.log = log;
}
boolean isRunning() {
@@ -317,10 +317,10 @@ public abstract class RaftBasicTests<CLUSTER extends
MiniRaftCluster>
}
} catch(Exception t) {
if (exceptionInClientThread.compareAndSet(null, t)) {
- LOG.error(this + " failed", t);
+ log.error(this + " failed", t);
} else {
exceptionInClientThread.get().addSuppressed(t);
- LOG.error(this + " failed again!", t);
+ log.error(this + " failed again!", t);
}
} finally {
isRunning.set(false);
@@ -345,15 +345,15 @@ public abstract class RaftBasicTests<CLUSTER extends
MiniRaftCluster>
}
static void testWithLoad(final int numClients, final int numMessages,
- boolean useAsync, MiniRaftCluster cluster, Logger LOG) throws Exception {
- LOG.info("Running testWithLoad: numClients=" + numClients
+ boolean useAsync, MiniRaftCluster cluster, Logger log) throws Exception {
+ log.info("Running testWithLoad: numClients=" + numClients
+ ", numMessages=" + numMessages + ", async=" + useAsync);
waitForLeader(cluster);
final List<Client4TestWithLoad> clients
= Stream.iterate(0, i -> i+1).limit(numClients)
- .map(i -> new Client4TestWithLoad(i, numMessages, useAsync, cluster,
LOG))
+ .map(i -> new Client4TestWithLoad(i, numMessages, useAsync, cluster,
log))
.collect(Collectors.toList());
final AtomicInteger lastStep = new AtomicInteger();
@@ -363,24 +363,24 @@ public abstract class RaftBasicTests<CLUSTER extends
MiniRaftCluster>
@Override
public void run() {
- LOG.info(cluster.printServers());
- LOG.info(BlockRequestHandlingInjection.getInstance().toString());
- LOG.info(cluster.toString());
- clients.forEach(c -> LOG.info(" " + c));
- JavaUtils.dumpAllThreads(s -> LOG.info(s));
+ log.info(cluster.printServers());
+ log.info(BlockRequestHandlingInjection.getInstance().toString());
+ log.info(cluster.toString());
+ clients.forEach(c -> log.info(" " + c));
+ JavaUtils.dumpAllThreads(s -> log.info(s));
final int last = lastStep.get();
if (last != previousLastStep) {
previousLastStep = last;
} else {
final RaftServer.Division leader = cluster.getLeader();
- LOG.info("NO PROGRESS at " + last + ", try to restart leader=" +
leader);
+ log.info("NO PROGRESS at " + last + ", try to restart leader=" +
leader);
if (leader != null) {
try {
cluster.restartServer(leader.getId(), false);
- LOG.info("Restarted leader=" + leader);
+ log.info("Restarted leader=" + leader);
} catch (IOException e) {
- LOG.error("Failed to restart leader=" + leader);
+ log.error("Failed to restart leader=" + leader);
}
}
}
@@ -411,10 +411,10 @@ public abstract class RaftBasicTests<CLUSTER extends
MiniRaftCluster>
RaftTestUtil.changeLeader(cluster, leader.getId());
}
} catch (IllegalStateException e) {
- LOG.error("Failed to change leader ", e);
+ log.error("Failed to change leader ", e);
}
}
- LOG.info("Leader change count=" + count);
+ log.info("Leader change count=" + count);
timer.cancel();
for(Client4TestWithLoad c : clients) {
@@ -425,7 +425,7 @@ public abstract class RaftBasicTests<CLUSTER extends
MiniRaftCluster>
}
}
- public static void testRequestTimeout(boolean async, MiniRaftCluster
cluster, Logger LOG) throws Exception {
+ public static void testRequestTimeout(boolean async, MiniRaftCluster
cluster, Logger log) throws Exception {
waitForLeader(cluster);
final Timestamp startTime = Timestamp.currentTime();
try (final RaftClient client = cluster.createClient()) {
diff --git a/ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java
b/ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java
index 2c1d34e27..f7a3f9a52 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java
@@ -328,7 +328,8 @@ public interface RaftTestUtil {
return entries;
}
- static Void assertLogEntries(RaftLog log, long expectedTerm, SimpleMessage[]
expectedMessages, Consumer<String> print) {
+ static Void assertLogEntries(RaftLog log, long expectedTerm, SimpleMessage[]
expectedMessages,
+ Consumer<String> print) {
final List<LogEntryProto> entries = getStateMachineLogEntries(log, print);
try {
assertLogEntries(entries, expectedTerm, expectedMessages);
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 f81ac9556..8929dfcc7 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RetryCacheTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RetryCacheTests.java
@@ -89,7 +89,8 @@ public abstract class RetryCacheTests<CLUSTER extends
MiniRaftCluster>
Assertions.assertTrue(reply.isSuccess());
}
- public void assertServer(MiniRaftCluster cluster, ClientId clientId, long
callId, long oldLastApplied) throws Exception {
+ public void assertServer(MiniRaftCluster cluster, ClientId clientId, long
callId, long oldLastApplied)
+ throws Exception {
final long leaderApplied =
cluster.getLeader().getInfo().getLastAppliedIndex();
// make sure retry cache has the entry
for (RaftServer.Division server : cluster.iterateDivisions()) {
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 6f381ca13..32e452758 100644
--- a/ratis-server/src/test/java/org/apache/ratis/WatchRequestTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/WatchRequestTests.java
@@ -141,26 +141,26 @@ public abstract class WatchRequestTests<CLUSTER extends
MiniRaftCluster>
}
}
- static void runTest(CheckedConsumer<TestParameters, Exception> testCase,
MiniRaftCluster cluster, Logger LOG)
+ static void runTest(CheckedConsumer<TestParameters, Exception> testCase,
MiniRaftCluster cluster, Logger log)
throws Exception {
try(final RaftClient client =
cluster.createClient(RaftTestUtil.waitForLeader(cluster).getId())) {
final int[] numMessages = {1, 10, 20};
for(int n : numMessages) {
- final TestParameters p = new TestParameters(n, client, cluster, LOG);
- LOG.info("{}) {}, {}", n, p, cluster.printServers());
+ final TestParameters p = new TestParameters(n, client, cluster, log);
+ log.info("{}) {}, {}", n, p, cluster.printServers());
testCase.accept(p);
}
}
}
static void runSingleTest(CheckedConsumer<TestParameters, Exception>
testCase,
- MiniRaftCluster cluster, Logger LOG)
+ MiniRaftCluster cluster, Logger log)
throws Exception {
try(final RaftClient client =
cluster.createClient(RaftTestUtil.waitForLeader(cluster).getId())) {
final int[] numMessages = {1};
for(int n : numMessages) {
- final TestParameters p = new TestParameters(n, client, cluster, LOG);
- LOG.info("{}) {}, {}", n, p, cluster.printServers());
+ final TestParameters p = new TestParameters(n, client, cluster, log);
+ log.info("{}) {}, {}", n, p, cluster.printServers());
testCase.accept(p);
}
}
@@ -176,7 +176,8 @@ public abstract class WatchRequestTests<CLUSTER extends
MiniRaftCluster>
WatchReplies(long logIndex,
CompletableFuture<RaftClientReply> majority,
CompletableFuture<RaftClientReply> all,
- CompletableFuture<RaftClientReply> majorityCommitted,
CompletableFuture<RaftClientReply> allCommitted, Logger log) {
+ CompletableFuture<RaftClientReply> majorityCommitted,
CompletableFuture<RaftClientReply> allCommitted,
+ Logger log) {
this.logIndex = logIndex;
this.majority = majority;
this.all = all;
@@ -218,19 +219,19 @@ public abstract class WatchRequestTests<CLUSTER extends
MiniRaftCluster>
}
static void runTestWatchRequestAsync(TestParameters p) throws Exception {
- final Logger LOG = p.log;
+ final Logger log = p.log;
final MiniRaftCluster cluster = p.cluster;
final int numMessages = p.numMessages;
// blockStartTransaction of the leader so that no transaction can be
committed MAJORITY
final RaftServer.Division leader = cluster.getLeader();
- LOG.info("block leader {}", leader.getId());
+ log.info("block leader {}", leader.getId());
SimpleStateMachine4Testing.get(leader).blockStartTransaction();
// blockFlushStateMachineData a follower so that no transaction can be
ALL_COMMITTED
final List<RaftServer.Division> followers = cluster.getFollowers();
final RaftServer.Division blockedFollower =
followers.get(ThreadLocalRandom.current().nextInt(followers.size()));
- LOG.info("block follower {}", blockedFollower.getId());
+ log.info("block follower {}", blockedFollower.getId());
SimpleStateMachine4Testing.get(blockedFollower).blockFlushStateMachineData();
// send a message
@@ -249,9 +250,9 @@ public abstract class WatchRequestTests<CLUSTER extends
MiniRaftCluster>
// unblock leader so that the transaction can be committed.
SimpleStateMachine4Testing.get(leader).unblockStartTransaction();
- LOG.info("unblock leader {}", leader.getId());
+ log.info("unblock leader {}", leader.getId());
- checkMajority(replies, watches, LOG);
+ checkMajority(replies, watches, log);
Assert.assertEquals(numMessages, watches.size());
@@ -261,16 +262,16 @@ public abstract class WatchRequestTests<CLUSTER extends
MiniRaftCluster>
assertNotDone(watches.stream().map(CompletableFuture::join).map(w ->
w.allCommitted));
// unblock follower so that the transaction can be replicated and
committed to all.
- LOG.info("unblock follower {}", blockedFollower.getId());
+ log.info("unblock follower {}", blockedFollower.getId());
SimpleStateMachine4Testing.get(blockedFollower).unblockFlushStateMachineData();
- checkAll(watches, LOG);
+ checkAll(watches, log);
}
static void checkMajority(List<CompletableFuture<RaftClientReply>> replies,
- List<CompletableFuture<WatchReplies>> watches, Logger LOG) throws
Exception {
+ List<CompletableFuture<WatchReplies>> watches, Logger log) throws
Exception {
for(int i = 0; i < replies.size(); i++) {
final RaftClientReply reply = replies.get(i).get(GET_TIMEOUT_SECOND,
TimeUnit.SECONDS);
- LOG.info("checkMajority {}: receive {}", i, reply);
+ log.info("checkMajority {}: receive {}", i, reply);
final long logIndex = reply.getLogIndex();
Assert.assertTrue(reply.isSuccess());
@@ -296,11 +297,11 @@ public abstract class WatchRequestTests<CLUSTER extends
MiniRaftCluster>
}
}
- static void checkAll(List<CompletableFuture<WatchReplies>> watches, Logger
LOG) throws Exception {
+ static void checkAll(List<CompletableFuture<WatchReplies>> watches, Logger
log) throws Exception {
for(int i = 0; i < watches.size(); i++) {
final WatchReplies watchReplies = watches.get(i).get(GET_TIMEOUT_SECOND,
TimeUnit.SECONDS);
final long logIndex = watchReplies.logIndex;
- LOG.info("checkAll {}: logIndex={}", i, logIndex);
+ log.info("checkAll {}: logIndex={}", i, logIndex);
final RaftClientReply watchAllReply = watchReplies.getAll();
final RaftClientReply watchAllCommittedReply =
watchReplies.getAllCommitted();
@@ -336,14 +337,14 @@ public abstract class WatchRequestTests<CLUSTER extends
MiniRaftCluster>
}
static void runTestWatchRequestAsyncChangeLeader(TestParameters p) throws
Exception {
- final Logger LOG = p.log;
+ final Logger log = p.log;
final MiniRaftCluster cluster = p.cluster;
final int numMessages = p.numMessages;
// blockFlushStateMachineData a follower so that no transaction can be
ALL_COMMITTED
final List<RaftServer.Division> followers = cluster.getFollowers();
final RaftServer.Division blockedFollower =
followers.get(ThreadLocalRandom.current().nextInt(followers.size()));
- LOG.info("block follower {}", blockedFollower.getId());
+ log.info("block follower {}", blockedFollower.getId());
SimpleStateMachine4Testing.get(blockedFollower).blockFlushStateMachineData();
final List<CompletableFuture<RaftClientReply>> replies = new ArrayList<>();
@@ -355,7 +356,7 @@ public abstract class WatchRequestTests<CLUSTER extends
MiniRaftCluster>
Assert.assertEquals(numMessages, watches.size());
// since only one follower is blocked commit, requests can be committed
MAJORITY and ALL but not ALL_COMMITTED.
- checkMajority(replies, watches, LOG);
+ checkMajority(replies, watches, log);
TimeUnit.SECONDS.sleep(1);
assertNotDone(watches.stream().map(CompletableFuture::join).map(w ->
w.allCommitted));
@@ -365,8 +366,8 @@ public abstract class WatchRequestTests<CLUSTER extends
MiniRaftCluster>
// unblock follower so that the transaction can be replicated and
committed to all.
SimpleStateMachine4Testing.get(blockedFollower).unblockFlushStateMachineData();
- LOG.info("unblock follower {}", blockedFollower.getId());
- checkAll(watches, LOG);
+ log.info("unblock follower {}", blockedFollower.getId());
+ checkAll(watches, log);
}
@Test
@@ -384,7 +385,7 @@ public abstract class WatchRequestTests<CLUSTER extends
MiniRaftCluster>
}
static void runTestWatchRequestTimeout(TestParameters p) throws Exception {
- final Logger LOG = p.log;
+ final Logger log = p.log;
final MiniRaftCluster cluster = p.cluster;
final int numMessages = p.numMessages;
@@ -394,13 +395,13 @@ public abstract class WatchRequestTests<CLUSTER extends
MiniRaftCluster>
// blockStartTransaction of the leader so that no transaction can be
committed MAJORITY
final RaftServer.Division leader = cluster.getLeader();
- LOG.info("block leader {}", leader.getId());
+ log.info("block leader {}", leader.getId());
SimpleStateMachine4Testing.get(leader).blockStartTransaction();
// blockFlushStateMachineData a follower so that no transaction can be
ALL_COMMITTED
final List<RaftServer.Division> followers = cluster.getFollowers();
final RaftServer.Division blockedFollower =
followers.get(ThreadLocalRandom.current().nextInt(followers.size()));
- LOG.info("block follower {}", blockedFollower.getId());
+ log.info("block follower {}", blockedFollower.getId());
SimpleStateMachine4Testing.get(blockedFollower).blockFlushStateMachineData();
// send a message
@@ -419,13 +420,13 @@ public abstract class WatchRequestTests<CLUSTER extends
MiniRaftCluster>
// unblock leader so that the transaction can be committed.
SimpleStateMachine4Testing.get(leader).unblockStartTransaction();
- LOG.info("unblock leader {}", leader.getId());
+ log.info("unblock leader {}", leader.getId());
- checkMajority(replies, watches, LOG);
- checkTimeout(replies, watches, LOG);
+ checkMajority(replies, watches, log);
+ checkTimeout(replies, watches, log);
SimpleStateMachine4Testing.get(blockedFollower).unblockFlushStateMachineData();
- LOG.info("unblock follower {}", blockedFollower.getId());
+ log.info("unblock follower {}", blockedFollower.getId());
}
@Test
@@ -446,7 +447,7 @@ public abstract class WatchRequestTests<CLUSTER extends
MiniRaftCluster>
}
static void runTestWatchRequestClientTimeout(TestParameters p) throws
Exception {
- final Logger LOG = p.log;
+ final Logger log = p.log;
CompletableFuture<RaftClientReply> watchReply;
// watch 1000 which will never be committed
@@ -459,7 +460,7 @@ public abstract class WatchRequestTests<CLUSTER extends
MiniRaftCluster>
watchReply.get();
fail("runTestWatchRequestClientTimeout failed");
} catch (Exception ex) {
- LOG.error("error occurred", ex);
+ log.error("error occurred", ex);
Assert.assertTrue(ex.getCause().getClass() ==
AlreadyClosedException.class ||
ex.getCause().getClass() == RaftRetryFailureException.class);
if (ex.getCause() != null) {
@@ -525,10 +526,10 @@ public abstract class WatchRequestTests<CLUSTER extends
MiniRaftCluster>
}
static void checkTimeout(List<CompletableFuture<RaftClientReply>> replies,
- List<CompletableFuture<WatchReplies>> watches, Logger LOG) throws
Exception {
+ List<CompletableFuture<WatchReplies>> watches, Logger log) throws
Exception {
for(int i = 0; i < replies.size(); i++) {
final RaftClientReply reply = replies.get(i).get(GET_TIMEOUT_SECOND,
TimeUnit.SECONDS);
- LOG.info("checkTimeout {}: receive {}", i, reply);
+ log.info("checkTimeout {}: receive {}", i, reply);
final long logIndex = reply.getLogIndex();
Assert.assertTrue(reply.isSuccess());
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/impl/BlockRequestHandlingInjection.java
b/ratis-server/src/test/java/org/apache/ratis/server/impl/BlockRequestHandlingInjection.java
index 3487aa472..9af62bc43 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/impl/BlockRequestHandlingInjection.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/impl/BlockRequestHandlingInjection.java
@@ -25,7 +25,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/** Inject code to block a server from handling incoming requests. */
-public class BlockRequestHandlingInjection implements
CodeInjectionForTesting.Code {
+public final class BlockRequestHandlingInjection implements
CodeInjectionForTesting.Code {
private static final BlockRequestHandlingInjection INSTANCE =
new BlockRequestHandlingInjection();
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 fbb909ac9..69791896a 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
@@ -312,15 +312,15 @@ public abstract class LeaderElectionTests<CLUSTER extends
MiniRaftCluster>
}
}
- static void enforceLeader(MiniRaftCluster cluster, final String newLeader,
Logger LOG) throws InterruptedException {
- LOG.info(cluster.printServers());
+ static void enforceLeader(MiniRaftCluster cluster, final String newLeader,
Logger log) throws InterruptedException {
+ log.info(cluster.printServers());
for(int i = 0; !cluster.tryEnforceLeader(newLeader) && i < 10; i++) {
final RaftServer.Division currLeader = cluster.getLeader();
- LOG.info("try enforcing leader to " + newLeader + " but " +
+ log.info("try enforcing leader to " + newLeader + " but " +
(currLeader == null ? "no leader for round " + i : "new leader is "
+ currLeader.getId()));
TimeDuration.ONE_SECOND.sleep();
}
- LOG.info(cluster.printServers());
+ log.info(cluster.printServers());
final RaftServer.Division leader = cluster.getLeader();
Assertions.assertEquals(newLeader, leader.getId().toString());
@@ -516,7 +516,8 @@ public abstract class LeaderElectionTests<CLUSTER extends
MiniRaftCluster>
long numLeaderElectionTimeout =
ratisMetricRegistry.counter(LEADER_ELECTION_TIMEOUT_COUNT_METRIC).getCount();
assertTrue(numLeaderElectionTimeout > 0);
- final DefaultTimekeeperImpl timekeeper = (DefaultTimekeeperImpl)
ratisMetricRegistry.timer(LEADER_ELECTION_TIME_TAKEN);
+ final DefaultTimekeeperImpl timekeeper =
+ (DefaultTimekeeperImpl)
ratisMetricRegistry.timer(LEADER_ELECTION_TIME_TAKEN);
final Timer timer = timekeeper.getTimer();
double meanTimeNs = timer.getSnapshot().getMean();
long elapsedNs = timestamp.elapsedTime().toLong(TimeUnit.NANOSECONDS);
@@ -606,7 +607,8 @@ public abstract class LeaderElectionTests<CLUSTER extends
MiniRaftCluster>
final TermIndex lastEntry = leader.getRaftLog().getLastEntryTermIndex();
RaftServer.Division listener = cluster.getListeners().get(0);
final RaftProtos.RequestVoteRequestProto r =
ServerProtoUtils.toRequestVoteRequestProto(
- leader.getMemberId(), listener.getId(),
leader.getRaftLog().getLastEntryTermIndex().getTerm() + 1, lastEntry, true);
+ leader.getMemberId(), listener.getId(),
+ leader.getRaftLog().getLastEntryTermIndex().getTerm() + 1, lastEntry,
true);
RaftProtos.RequestVoteReplyProto listenerReply =
listener.getRaftServer().requestVote(r);
Assertions.assertFalse(listenerReply.getServerReply().getSuccess());
}
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/impl/MiniRaftCluster.java
b/ratis-server/src/test/java/org/apache/ratis/server/impl/MiniRaftCluster.java
index 29f1f84cb..9a54700ec 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/impl/MiniRaftCluster.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/impl/MiniRaftCluster.java
@@ -121,16 +121,18 @@ public abstract class MiniRaftCluster implements
Closeable {
runWithNewCluster(numServers, 0, true, testCase);
}
- default void runWithNewCluster(int numServers, boolean startCluster,
CheckedConsumer<CLUSTER, Exception> testCase) throws Exception {
+ default void runWithNewCluster(int numServers, boolean startCluster,
CheckedConsumer<CLUSTER, Exception> testCase)
+ throws Exception {
runWithNewCluster(numServers, 0, startCluster, testCase);
}
- default void runWithNewCluster(int numServers, int numListeners,
CheckedConsumer<CLUSTER, Exception> testCase) throws Exception {
+ default void runWithNewCluster(int numServers, int numListeners,
CheckedConsumer<CLUSTER, Exception> testCase)
+ throws Exception {
runWithNewCluster(numServers, numListeners, true, testCase);
}
- default void runWithNewCluster(int numServers, int numListeners, boolean
startCluster, CheckedConsumer<CLUSTER, Exception> testCase)
- throws Exception {
+ default void runWithNewCluster(int numServers, int numListeners, boolean
startCluster,
+ CheckedConsumer<CLUSTER, Exception> testCase) throws Exception {
final StackTraceElement caller =
JavaUtils.getCallerStackTraceElement();
LOG.info("Running " + caller.getMethodName());
final CLUSTER cluster = newCluster(numServers, numListeners);
@@ -152,7 +154,8 @@ public abstract class MiniRaftCluster implements Closeable {
runWithSameCluster(numServers, 0, testCase);
}
- default void runWithSameCluster(int numServers, int numListeners,
CheckedConsumer<CLUSTER, Exception> testCase) throws Exception {
+ default void runWithSameCluster(int numServers, int numListeners,
CheckedConsumer<CLUSTER, Exception> testCase)
+ throws Exception {
final StackTraceElement caller =
JavaUtils.getCallerStackTraceElement();
LOG.info("Running " + caller.getMethodName());
CLUSTER cluster = null;
@@ -322,15 +325,15 @@ public abstract class MiniRaftCluster implements
Closeable {
return this;
}
- public RaftServerProxy putNewServer(RaftPeerId id, RaftGroup group, boolean
format) {
- final RaftServerProxy s = newRaftServer(id, group, format);
+ public RaftServerProxy putNewServer(RaftPeerId id, RaftGroup raftGroup,
boolean format) {
+ final RaftServerProxy s = newRaftServer(id, raftGroup, format);
peers.put(s.getId(), s.getPeer());
Preconditions.assertTrue(servers.put(id, s) == null);
return s;
}
- private Collection<RaftServer> putNewServers(Iterable<RaftPeerId> peers,
boolean format, RaftGroup raftGroup) {
- return StreamSupport.stream(peers.spliterator(), false)
+ private Collection<RaftServer> putNewServers(Iterable<RaftPeerId> peerIds,
boolean format, RaftGroup raftGroup) {
+ return StreamSupport.stream(peerIds.spliterator(), false)
.map(id -> putNewServer(id, raftGroup, format))
.collect(Collectors.toList());
}
@@ -356,13 +359,14 @@ public abstract class MiniRaftCluster implements
Closeable {
return restartServer(serverId, group, format);
}
- public RaftServer.Division restartServer(RaftPeerId serverId, RaftGroup
group, boolean format) throws IOException {
+ public RaftServer.Division restartServer(RaftPeerId serverId, RaftGroup
raftGroup, boolean format)
+ throws IOException {
killServer(serverId);
servers.remove(serverId);
- final RaftServer proxy = putNewServer(serverId, group, format);
+ final RaftServer proxy = putNewServer(serverId, raftGroup, format);
proxy.start();
- return group == null? null: proxy.getDivision(group.getGroupId());
+ return raftGroup == null? null: proxy.getDivision(raftGroup.getGroupId());
}
public void restart(boolean format) throws IOException {
@@ -378,8 +382,8 @@ public abstract class MiniRaftCluster implements Closeable {
return RaftServerConfigKeys.Rpc.timeoutMax(properties);
}
- private RaftServerProxy newRaftServer(RaftPeerId id, RaftGroup group,
boolean format) {
- LOG.info("newRaftServer: {}, {}, format? {}", id, group, format);
+ private RaftServerProxy newRaftServer(RaftPeerId id, RaftGroup raftGroup,
boolean format) {
+ LOG.info("newRaftServer: {}, {}, format? {}", id, raftGroup, format);
try {
final File dir = getStorageDir(id);
if (format) {
@@ -388,27 +392,27 @@ public abstract class MiniRaftCluster implements
Closeable {
}
final RaftProperties prop = new RaftProperties(properties);
RaftServerConfigKeys.setStorageDir(prop, Collections.singletonList(dir));
- return ServerImplUtils.newRaftServer(id, group,
+ return ServerImplUtils.newRaftServer(id, raftGroup,
format? RaftStorage.StartupOption.FORMAT:
RaftStorage.StartupOption.RECOVER,
- getStateMachineRegistry(prop), null, prop,
setPropertiesAndInitParameters(id, group, prop));
+ getStateMachineRegistry(prop), null, prop,
setPropertiesAndInitParameters(id, raftGroup, prop));
} catch (IOException e) {
throw new RuntimeException(e);
}
}
protected abstract Parameters setPropertiesAndInitParameters(
- RaftPeerId id, RaftGroup group, RaftProperties properties);
+ RaftPeerId id, RaftGroup raftGroup, RaftProperties raftProperties);
public void setStateMachineRegistry(StateMachine.Registry
stateMachineRegistry) {
this.stateMachineRegistry = stateMachineRegistry;
}
- StateMachine.Registry getStateMachineRegistry(RaftProperties properties) {
+ StateMachine.Registry getStateMachineRegistry(RaftProperties raftProperties)
{
if (stateMachineRegistry != null) {
return stateMachineRegistry;
}
- final Class<? extends StateMachine> smClass = properties.getClass(
+ final Class<? extends StateMachine> smClass = raftProperties.getClass(
STATEMACHINE_CLASS_KEY, null, StateMachine.class);
if (smClass == null) {
return STATEMACHINE_REGISTRY_DEFAULT;
@@ -424,7 +428,7 @@ public abstract class MiniRaftCluster implements Closeable {
try {
final Class<?>[] argClasses = {RaftProperties.class};
- return ReflectionUtils.newInstance(smClass, argClasses, properties);
+ return ReflectionUtils.newInstance(smClass, argClasses,
raftProperties);
} catch(RuntimeException e) {
exception.addSuppressed(e);
}
@@ -496,8 +500,8 @@ public abstract class MiniRaftCluster implements Closeable {
return new PeerChanges(p, np, RaftPeer.emptyArray());
}
- void startServers(Iterable<? extends RaftServer> servers) throws IOException
{
- for(RaftServer s : servers) {
+ void startServers(Iterable<? extends RaftServer> raftServers) throws
IOException {
+ for(RaftServer s : raftServers) {
s.start();
peers.put(s.getId(), s.getPeer());
}
@@ -508,12 +512,12 @@ public abstract class MiniRaftCluster implements
Closeable {
*/
public PeerChanges removePeers(int number, boolean removeLeader,
Collection<RaftPeer> excluded) throws InterruptedException {
- Collection<RaftPeer> peers = new ArrayList<>(group.getPeers());
+ Collection<RaftPeer> raftPeers = new ArrayList<>(group.getPeers());
List<RaftPeer> removedPeers = new ArrayList<>(number);
if (removeLeader) {
final RaftPeer leader = RaftTestUtil.waitForLeader(this).getPeer();
Preconditions.assertTrue(!excluded.contains(leader));
- peers.remove(leader);
+ raftPeers.remove(leader);
removedPeers.add(leader);
}
final List<RaftServer.Division> followers = getFollowers();
@@ -521,12 +525,12 @@ public abstract class MiniRaftCluster implements
Closeable {
removed < (removeLeader ? number - 1 : number); i++) {
RaftPeer toRemove = followers.get(i).getPeer();
if (!excluded.contains(toRemove)) {
- peers.remove(toRemove);
+ raftPeers.remove(toRemove);
removedPeers.add(toRemove);
removed++;
}
}
- final RaftPeer[] p = peers.toArray(RaftPeer.emptyArray());
+ final RaftPeer[] p = raftPeers.toArray(RaftPeer.emptyArray());
group = RaftGroup.valueOf(group.getGroupId(), p);
return new PeerChanges(p, RaftPeer.emptyArray(),
removedPeers.toArray(RaftPeer.emptyArray()));
}
@@ -728,13 +732,13 @@ public abstract class MiniRaftCluster implements
Closeable {
return toRaftPeers(getServers());
}
- RaftPeer getPeer(RaftPeerId id, RaftGroup group) {
+ RaftPeer getPeer(RaftPeerId id, RaftGroup raftGroup) {
RaftPeer p = peers.get(id);
if (p != null) {
return p;
}
- if (group != null) {
- p = group.getPeer(id);
+ if (raftGroup != null) {
+ p = raftGroup.getPeer(id);
}
if (p == null) {
p =
Optional.ofNullable(servers.get(id)).map(RaftServerProxy::getPeer).orElse(null);
@@ -769,21 +773,21 @@ public abstract class MiniRaftCluster implements
Closeable {
return createClient(leaderId, group, retryPolicy);
}
- public RaftClient createClient(RaftPeerId leaderId, RaftGroup group) {
- return createClient(leaderId, group, getDefaultRetryPolicy());
+ public RaftClient createClient(RaftPeerId leaderId, RaftGroup raftGroup) {
+ return createClient(leaderId, raftGroup, getDefaultRetryPolicy());
}
public RaftClient createClient(RaftPeer primaryServer) {
return createClient(null, group, getDefaultRetryPolicy(), primaryServer);
}
- public RaftClient createClient(RaftPeerId leaderId, RaftGroup group,
RetryPolicy retryPolicy) {
- return createClient(leaderId, group, retryPolicy, null);
+ public RaftClient createClient(RaftPeerId leaderId, RaftGroup raftGroup,
RetryPolicy retryPolicy) {
+ return createClient(leaderId, raftGroup, retryPolicy, null);
}
- public RaftClient createClient(RaftPeerId leaderId, RaftGroup group,
RetryPolicy retryPolicy, RaftPeer primaryServer) {
+ public RaftClient createClient(RaftPeerId leaderId, RaftGroup raftGroup,
RetryPolicy retryPolicy, RaftPeer primaryServer) {
RaftClient.Builder builder = RaftClient.newBuilder()
- .setRaftGroup(group)
+ .setRaftGroup(raftGroup)
.setLeaderId(leaderId)
.setProperties(properties)
.setParameters(parameters)
@@ -811,15 +815,15 @@ public abstract class MiniRaftCluster implements
Closeable {
public SetConfigurationRequest newSetConfigurationRequest(
ClientId clientId, RaftPeerId leaderId,
- RaftPeer... peers) {
+ RaftPeer... raftPeers) {
return new SetConfigurationRequest(clientId, leaderId, getGroupId(),
CallId.getDefault(),
-
SetConfigurationRequest.Arguments.newBuilder().setServersInNewConf(peers).build());
+
SetConfigurationRequest.Arguments.newBuilder().setServersInNewConf(raftPeers).build());
}
- public void setConfiguration(RaftPeer... peers) throws IOException {
+ public void setConfiguration(RaftPeer... raftPeers) throws IOException {
try(RaftClient client = createClient()) {
- LOG.info("Start changing the configuration: {}", Arrays.asList(peers));
- final RaftClientReply reply = client.admin().setConfiguration(peers);
+ LOG.info("Start changing the configuration: {}",
Arrays.asList(raftPeers));
+ final RaftClientReply reply = client.admin().setConfiguration(raftPeers);
Preconditions.assertTrue(reply.isSuccess());
}
}
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 58a51e051..0054e1601 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
@@ -58,9 +58,12 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-public class RaftServerTestUtil {
+public final class RaftServerTestUtil {
static final Logger LOG = LoggerFactory.getLogger(RaftServerTestUtil.class);
+ private RaftServerTestUtil() {
+ }
+
public static final RaftGroupMemberId TEST_MEMBER_ID =
RaftGroupMemberId.valueOf(
RaftPeerId.valueOf("test"), RaftGroupId.emptyGroupId());
@@ -248,7 +251,8 @@ public class RaftServerTestUtil {
}
// All new peers has been added. Handle the removed peers.
- List<RaftPeer> peersToRemove = peers.stream().filter(peer ->
!peersInNewConf.contains(peer)).collect(Collectors.toList());
+ List<RaftPeer> peersToRemove = peers.stream().filter(peer ->
!peersInNewConf.contains(peer))
+ .collect(Collectors.toList());
if (!peersToRemove.isEmpty()) {
return peersInNewConf;
}
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/impl/RetryCacheTestUtil.java
b/ratis-server/src/test/java/org/apache/ratis/server/impl/RetryCacheTestUtil.java
index e5a55e49c..439245b49 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/impl/RetryCacheTestUtil.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/impl/RetryCacheTestUtil.java
@@ -36,7 +36,11 @@ import static org.mockito.Mockito.doCallRealMethod;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public class RetryCacheTestUtil {
+public final class RetryCacheTestUtil {
+
+ private RetryCacheTestUtil() {
+ }
+
public static RetryCache createRetryCache(){
return new RetryCacheImpl(TimeDuration.valueOf(60, TimeUnit.SECONDS),
null);
}
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/impl/TestLogAppenderMetrics.java
b/ratis-server/src/test/java/org/apache/ratis/server/impl/TestLogAppenderMetrics.java
index 4bd075ef6..6a4673468 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/impl/TestLogAppenderMetrics.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/impl/TestLogAppenderMetrics.java
@@ -83,16 +83,16 @@ public class TestLogAppenderMetrics {
return nextIndex;
}
- void updateNextIndex(long nextIndex) {
- this.nextIndex = nextIndex;
+ void updateNextIndex(long index) {
+ this.nextIndex = index;
}
long getMatchIndex() {
return matchIndex;
}
- void updateMatchIndex(long matchIndex) {
- this.matchIndex = matchIndex;
+ void updateMatchIndex(long index) {
+ this.matchIndex = index;
}
Timestamp getLastRpcTime() {
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/simulation/MiniRaftClusterWithSimulatedRpc.java
b/ratis-server/src/test/java/org/apache/ratis/server/simulation/MiniRaftClusterWithSimulatedRpc.java
index d0e7e9f5c..922796cb8 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/simulation/MiniRaftClusterWithSimulatedRpc.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/simulation/MiniRaftClusterWithSimulatedRpc.java
@@ -34,7 +34,7 @@ import java.util.stream.StreamSupport;
import static org.apache.ratis.conf.ConfUtils.requireMin;
-public class MiniRaftClusterWithSimulatedRpc extends MiniRaftCluster {
+public final class MiniRaftClusterWithSimulatedRpc extends MiniRaftCluster {
static final Logger LOG =
LoggerFactory.getLogger(MiniRaftClusterWithSimulatedRpc.class);
public static final Factory<MiniRaftClusterWithSimulatedRpc> FACTORY
diff --git
a/ratis-server/src/test/java/org/apache/ratis/statemachine/impl/SimpleStateMachine4Testing.java
b/ratis-server/src/test/java/org/apache/ratis/statemachine/impl/SimpleStateMachine4Testing.java
index e2e29238f..18e4f2eca 100644
---
a/ratis-server/src/test/java/org/apache/ratis/statemachine/impl/SimpleStateMachine4Testing.java
+++
b/ratis-server/src/test/java/org/apache/ratis/statemachine/impl/SimpleStateMachine4Testing.java
@@ -210,12 +210,12 @@ public class SimpleStateMachine4Testing extends
BaseStateMachine {
}
@Override
- public synchronized void initialize(RaftServer server, RaftGroupId groupId,
+ public synchronized void initialize(RaftServer server, RaftGroupId
raftGroupId,
RaftStorage raftStorage) throws IOException {
LOG.info("Initializing " + this);
- this.groupId = groupId;
+ this.groupId = raftGroupId;
getLifeCycle().startAndTransition(() -> {
- super.initialize(server, groupId, raftStorage);
+ super.initialize(server, raftGroupId, raftStorage);
storage.init(raftStorage);
loadSnapshot(storage.getLatestSnapshot());
diff --git
a/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamAsyncClusterTests.java
b/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamAsyncClusterTests.java
index 2fcf500e2..a34350206 100644
---
a/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamAsyncClusterTests.java
+++
b/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamAsyncClusterTests.java
@@ -103,15 +103,18 @@ public abstract class DataStreamAsyncClusterTests<CLUSTER
extends MiniRaftCluste
long runMultipleStreams(CLUSTER cluster, boolean stepDownLeader) {
final List<CompletableFuture<Long>> futures = new ArrayList<>();
- futures.add(CompletableFuture.supplyAsync(() -> runTestDataStream(cluster,
5, 10, 100_000, 10, stepDownLeader), executor));
- futures.add(CompletableFuture.supplyAsync(() -> runTestDataStream(cluster,
2, 20, 1_000, 5_000, stepDownLeader), executor));
+ futures.add(CompletableFuture.supplyAsync(() ->
+ runTestDataStream(cluster, 5, 10, 100_000, 10, stepDownLeader),
executor));
+ futures.add(CompletableFuture.supplyAsync(() ->
+ runTestDataStream(cluster, 2, 20, 1_000, 5_000, stepDownLeader),
executor));
return futures.stream()
.map(CompletableFuture::join)
.max(Long::compareTo)
.orElseThrow(IllegalStateException::new);
}
- void runTestDataStream(CLUSTER cluster, boolean stepDownLeader,
CheckedBiFunction<CLUSTER, Boolean, Long, Exception> runMethod) throws
Exception {
+ void runTestDataStream(CLUSTER cluster, boolean stepDownLeader,
+ CheckedBiFunction<CLUSTER, Boolean, Long, Exception> runMethod) throws
Exception {
RaftTestUtil.waitForLeader(cluster);
final long maxIndex = runMethod.apply(cluster, stepDownLeader);
diff --git
a/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamBaseTest.java
b/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamBaseTest.java
index 2ac01ac1f..ee56f334e 100644
---
a/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamBaseTest.java
+++
b/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamBaseTest.java
@@ -44,8 +44,8 @@ import java.util.stream.Collectors;
abstract class DataStreamBaseTest extends BaseTest {
RaftConfiguration getRaftConf() {
- final List<RaftPeer> peers =
servers.stream().map(Server::getPeer).collect(Collectors.toList());
- return RaftServerTestUtil.newRaftConfiguration(peers);
+ final List<RaftPeer> peerList =
servers.stream().map(Server::getPeer).collect(Collectors.toList());
+ return RaftServerTestUtil.newRaftConfiguration(peerList);
}
static class Server {
@@ -90,21 +90,21 @@ abstract class DataStreamBaseTest extends BaseTest {
return servers.get(0);
}
- void setup(RaftGroupId groupId, List<RaftPeer> peers, List<RaftServer>
raftServers) throws Exception {
- raftGroup = RaftGroup.valueOf(groupId, peers);
- this.peers = peers;
- servers = new ArrayList<>(peers.size());
+ void setup(RaftGroupId groupId, List<RaftPeer> peerList, List<RaftServer>
raftServers) throws Exception {
+ raftGroup = RaftGroup.valueOf(groupId, peerList);
+ this.peers = peerList;
+ servers = new ArrayList<>(peerList.size());
// start stream servers on raft peers.
- for (int i = 0; i < peers.size(); i++) {
- final Server server = new Server(peers.get(i), raftServers.get(i));
- server.addRaftPeers(removePeerFromList(peers.get(i), peers));
+ for (int i = 0; i < peerList.size(); i++) {
+ final Server server = new Server(peerList.get(i), raftServers.get(i));
+ server.addRaftPeers(removePeerFromList(peerList.get(i), peerList));
server.start();
servers.add(server);
}
}
- private Collection<RaftPeer> removePeerFromList(RaftPeer peer,
List<RaftPeer> peers) {
- List<RaftPeer> otherPeers = new ArrayList<>(peers);
+ private Collection<RaftPeer> removePeerFromList(RaftPeer peer,
List<RaftPeer> peerList) {
+ List<RaftPeer> otherPeers = new ArrayList<>(peerList);
otherPeers.remove(peer);
return otherPeers;
}
diff --git
a/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamTestUtils.java
b/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamTestUtils.java
index 7735c3e30..ab28214f9 100644
---
a/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamTestUtils.java
+++
b/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamTestUtils.java
@@ -338,7 +338,8 @@ public interface DataStreamTestUtils {
Assertions.assertEquals(RaftClientRequest.dataStreamRequestType(),
header.getType());
// check stream
- final MultiDataStreamStateMachine stateMachine =
(MultiDataStreamStateMachine)
server.getDivision(header.getRaftGroupId()).getStateMachine();
+ final MultiDataStreamStateMachine stateMachine =
+ (MultiDataStreamStateMachine)
server.getDivision(header.getRaftGroupId()).getStateMachine();
final SingleDataStream stream = stateMachine.getSingleDataStream(header);
final MyDataChannel channel = stream.getDataChannel();
Assertions.assertEquals(dataSize, channel.getBytesWritten());
diff --git
a/ratis-test/src/test/java/org/apache/ratis/datastream/MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty.java
b/ratis-test/src/test/java/org/apache/ratis/datastream/MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty.java
index b9e20fb82..82fab6477 100644
---
a/ratis-test/src/test/java/org/apache/ratis/datastream/MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty.java
+++
b/ratis-test/src/test/java/org/apache/ratis/datastream/MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty.java
@@ -30,7 +30,7 @@ import org.apache.ratis.rpc.SupportedRpcType;
/**
* A {@link MiniRaftCluster} with {{@link SupportedRpcType#GRPC}} and {@link
SupportedDataStreamType#NETTY}.
*/
-public class MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty extends
MiniRaftClusterWithGrpc {
+public final class MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty
extends MiniRaftClusterWithGrpc {
static class Factory extends
MiniRaftCluster.Factory<MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty> {
private final Parameters parameters;
@@ -49,15 +49,16 @@ public class
MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty extends MiniRa
public static final Factory FACTORY = new Factory(null);
- public interface FactoryGet extends
MiniRaftCluster.Factory.Get<MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty>
{
+ public interface FactoryGet
+ extends
MiniRaftCluster.Factory.Get<MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty>
{
@Override
default
MiniRaftCluster.Factory<MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty>
getFactory() {
return FACTORY;
}
}
- private MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty(String[] ids,
String[] listenerIds, RaftProperties properties,
- Parameters parameters) {
+ private MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty(String[] ids,
String[] listenerIds,
+ RaftProperties properties, Parameters parameters) {
super(ids, listenerIds, properties, parameters);
}
diff --git
a/ratis-test/src/test/java/org/apache/ratis/datastream/MiniRaftClusterWithRpcTypeNettyAndDataStreamTypeNetty.java
b/ratis-test/src/test/java/org/apache/ratis/datastream/MiniRaftClusterWithRpcTypeNettyAndDataStreamTypeNetty.java
index 1e5149b43..9179fa039 100644
---
a/ratis-test/src/test/java/org/apache/ratis/datastream/MiniRaftClusterWithRpcTypeNettyAndDataStreamTypeNetty.java
+++
b/ratis-test/src/test/java/org/apache/ratis/datastream/MiniRaftClusterWithRpcTypeNettyAndDataStreamTypeNetty.java
@@ -30,7 +30,7 @@ import org.apache.ratis.rpc.SupportedRpcType;
/**
* A {@link MiniRaftCluster} with {{@link SupportedRpcType#NETTY}} and {@link
SupportedDataStreamType#NETTY}.
*/
-public class MiniRaftClusterWithRpcTypeNettyAndDataStreamTypeNetty extends
MiniRaftClusterWithNetty {
+public final class MiniRaftClusterWithRpcTypeNettyAndDataStreamTypeNetty
extends MiniRaftClusterWithNetty {
public static final
Factory<MiniRaftClusterWithRpcTypeNettyAndDataStreamTypeNetty> FACTORY
= new Factory<MiniRaftClusterWithRpcTypeNettyAndDataStreamTypeNetty>() {
@Override
@@ -49,7 +49,8 @@ public class
MiniRaftClusterWithRpcTypeNettyAndDataStreamTypeNetty extends MiniR
}
}
- private MiniRaftClusterWithRpcTypeNettyAndDataStreamTypeNetty(String[] ids,
String[] listenerIds, RaftProperties properties) {
+ private MiniRaftClusterWithRpcTypeNettyAndDataStreamTypeNetty(String[] ids,
String[] listenerIds,
+ RaftProperties properties) {
super(ids, listenerIds, properties);
}
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 8e6d892c8..247a7bcac 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
@@ -36,12 +36,12 @@ public class
TestDataStreamSslWithRpcTypeGrpcAndDataStreamTypeNetty
}
Parameters newParameters() {
- final Parameters parameters = new Parameters();
+ final Parameters parameters1 = new Parameters();
final TlsConf serverTlsConfig = SecurityTestUtils.newServerTlsConfig(true);
- NettyConfigKeys.DataStream.Server.setTlsConf(parameters, serverTlsConfig);
+ NettyConfigKeys.DataStream.Server.setTlsConf(parameters1, serverTlsConfig);
final TlsConf clientTlsConfig = SecurityTestUtils.newClientTlsConfig(true);
- NettyConfigKeys.DataStream.Client.setTlsConf(parameters, clientTlsConfig);
- return parameters;
+ NettyConfigKeys.DataStream.Client.setTlsConf(parameters1, clientTlsConfig);
+ return parameters1;
}
private final Supplier<Parameters> parameters =
JavaUtils.memoize(this::newParameters);
diff --git
a/ratis-test/src/test/java/org/apache/ratis/datastream/TestNettyDataStreamWithMock.java
b/ratis-test/src/test/java/org/apache/ratis/datastream/TestNettyDataStreamWithMock.java
index 1d8c67a43..8193f1d98 100644
---
a/ratis-test/src/test/java/org/apache/ratis/datastream/TestNettyDataStreamWithMock.java
+++
b/ratis-test/src/test/java/org/apache/ratis/datastream/TestNettyDataStreamWithMock.java
@@ -114,8 +114,8 @@ public class TestNettyDataStreamWithMock extends
DataStreamBaseTest {
submitException != null ? submitException : leaderException,
getStateMachineException);
}
- void runTestMockCluster(RaftGroupId groupId, List<RaftServer> raftServers,
ClientId clientId, int bufferSize, int bufferNum,
- Exception expectedException, Exception headerException) throws Exception
{
+ void runTestMockCluster(RaftGroupId groupId, List<RaftServer> raftServers,
ClientId clientId, int bufferSize,
+ int bufferNum, Exception expectedException, Exception headerException)
throws Exception {
try {
final List<RaftPeer> peers = raftServers.stream()
.map(TestNettyDataStreamWithMock::newRaftPeer)
diff --git
a/ratis-test/src/test/java/org/apache/ratis/grpc/TestGrpcMessageMetrics.java
b/ratis-test/src/test/java/org/apache/ratis/grpc/TestGrpcMessageMetrics.java
index aee13223b..812c691e2 100644
--- a/ratis-test/src/test/java/org/apache/ratis/grpc/TestGrpcMessageMetrics.java
+++ b/ratis-test/src/test/java/org/apache/ratis/grpc/TestGrpcMessageMetrics.java
@@ -60,7 +60,8 @@ public class TestGrpcMessageMetrics extends BaseTest
client.async().send(new RaftTestUtil.SimpleMessage("abc"));
}
// Wait for commits to happen on leader
- JavaUtils.attempt(() -> assertMessageCount(cluster.getLeader()), 100,
HUNDRED_MILLIS, cluster.getLeader().getId() + "-assertMessageCount", null);
+ JavaUtils.attempt(() -> assertMessageCount(cluster.getLeader()), 100,
HUNDRED_MILLIS,
+ cluster.getLeader().getId() + "-assertMessageCount", null);
}
static void assertMessageCount(RaftServer.Division server) {
@@ -68,6 +69,7 @@ public class TestGrpcMessageMetrics extends BaseTest
GrpcService service = (GrpcService)
RaftServerTestUtil.getServerRpc(server);
RatisMetricRegistry registry =
service.getServerInterceptor().getMetrics().getRegistry();
String counter_prefix = serverId + "_" +
"ratis.grpc.RaftServerProtocolService";
- Assertions.assertTrue(registry.counter(counter_prefix + "_" +
"requestVote" + "_OK_completed_total").getCount() > 0);
+ Assertions.assertTrue(
+ registry.counter(counter_prefix + "_" + "requestVote" +
"_OK_completed_total").getCount() > 0);
}
}
\ No newline at end of file
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 05d772c17..e6e39e8ee 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
@@ -302,7 +302,7 @@ public class TestRaftServerWithGrpc extends BaseTest
implements MiniRaftClusterW
}
}
}
-
+
static ByteString randomByteString(int size) {
final ByteString.Output out = ByteString.newOutput(size);
final ThreadLocalRandom random = ThreadLocalRandom.current();
diff --git
a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRetryCacheWithGrpc.java
b/ratis-test/src/test/java/org/apache/ratis/grpc/TestRetryCacheWithGrpc.java
index b24469143..5a704689d 100644
--- a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRetryCacheWithGrpc.java
+++ b/ratis-test/src/test/java/org/apache/ratis/grpc/TestRetryCacheWithGrpc.java
@@ -89,7 +89,8 @@ public class TestRetryCacheWithGrpc
assertRetryCacheEntry(client, callId, exist, false);
}
- void assertRetryCacheEntry(RaftClient client, long callId, boolean exist,
boolean eventually) throws InterruptedException {
+ void assertRetryCacheEntry(RaftClient client, long callId, boolean exist,
boolean eventually)
+ throws InterruptedException {
Supplier<RetryCache.Entry> lookup = () -> RetryCacheTestUtil.get(leader,
client.getId(), callId);
Consumer<RetryCache.Entry> assertion = exist ? Assertions::assertNotNull
: Assertions::assertNull;
if (eventually) {
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 11311f360..005c5cf41 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
@@ -166,7 +166,8 @@ public abstract class ServerRestartTests<CLUSTER extends
MiniRaftCluster>
}
}
- static void assertTruncatedLog(RaftPeerId id, File openLogFile, long
lastIndex, MiniRaftCluster cluster) throws Exception {
+ static void assertTruncatedLog(RaftPeerId id, File openLogFile, long
lastIndex, MiniRaftCluster cluster)
+ throws Exception {
// truncate log
if (openLogFile.length() > 0) {
FileUtils.truncateFile(openLogFile, openLogFile.length() - 1);
@@ -218,14 +219,14 @@ public abstract class ServerRestartTests<CLUSTER extends
MiniRaftCluster>
}
static void assertCorruptedLogHeader(RaftPeerId id, File openLogFile, int
partialLength,
- MiniRaftCluster cluster, Logger LOG) throws Exception {
+ MiniRaftCluster cluster, Logger log) throws Exception {
Preconditions.assertTrue(partialLength <
SegmentedRaftLogFormat.getHeaderLength());
try(final RandomAccessFile raf = new RandomAccessFile(openLogFile, "rw")) {
final ByteBuffer header = SegmentedRaftLogFormat.getHeaderBytebuffer();
- LOG.info("header = {}", StringUtils.bytes2HexString(header));
+ log.info("header = {}", StringUtils.bytes2HexString(header));
final byte[] corrupted = new byte[header.remaining()];
header.get(corrupted, 0, partialLength);
- LOG.info("corrupted = {}", StringUtils.bytes2HexString(corrupted));
+ log.info("corrupted = {}", StringUtils.bytes2HexString(corrupted));
raf.write(corrupted);
}
final RaftServer.Division server = cluster.restartServer(id, false);
diff --git
a/ratis-test/src/test/java/org/apache/ratis/server/impl/TestRaftConfiguration.java
b/ratis-test/src/test/java/org/apache/ratis/server/impl/TestRaftConfiguration.java
index 77ec0ed29..fa2c524e7 100644
---
a/ratis-test/src/test/java/org/apache/ratis/server/impl/TestRaftConfiguration.java
+++
b/ratis-test/src/test/java/org/apache/ratis/server/impl/TestRaftConfiguration.java
@@ -39,8 +39,8 @@ public class TestRaftConfiguration extends BaseTest {
Integer node3 = 2;
PeerConfiguration peerConfig = new
PeerConfiguration(raftPeersWithPriority(node1, node2, node3));
RaftConfiguration config =
RaftConfigurationImpl.newBuilder().setConf(peerConfig).build();
- RaftPeer[] allRaftPeers =
peerConfig.getPeers(RaftProtos.RaftPeerRole.FOLLOWER).toArray(new
RaftPeer[peerConfig.getPeers(
- RaftProtos.RaftPeerRole.FOLLOWER).size()]);
+ RaftPeer[] allRaftPeers =
peerConfig.getPeers(RaftProtos.RaftPeerRole.FOLLOWER).toArray(
+ new
RaftPeer[peerConfig.getPeers(RaftProtos.RaftPeerRole.FOLLOWER).size()]);
// First member should not have highest priority
assertFalse(RaftServerTestUtil.isHighestPriority(config,
diff --git
a/ratis-test/src/test/java/org/apache/ratis/server/impl/TestRaftServerJmx.java
b/ratis-test/src/test/java/org/apache/ratis/server/impl/TestRaftServerJmx.java
index d549e3781..b24ec72c0 100644
---
a/ratis-test/src/test/java/org/apache/ratis/server/impl/TestRaftServerJmx.java
+++
b/ratis-test/src/test/java/org/apache/ratis/server/impl/TestRaftServerJmx.java
@@ -87,20 +87,33 @@ public class TestRaftServerJmx extends BaseTest {
static void runRegister(boolean expectToSucceed, String name, JmxRegister
jmx) {
final RaftServerMXBean mBean = new RaftServerMXBean() {
@Override
- public String getId() { return null; }
+ public String getId() {
+ return null;
+ }
@Override
- public String getLeaderId() { return null; }
+ public String getLeaderId() {
+ return null;
+ }
@Override
- public long getCurrentTerm() { return 0; }
+ public long getCurrentTerm() {
+ return 0;
+ }
@Override
- public String getGroupId() { return null; }
+ public String getGroupId() {
+ return null;
+ }
@Override
- public String getRole() { return null; }
+ public String getRole() {
+ return null;
+ }
@Override
- public List<String> getFollowers() { return null; }
+ public List<String> getFollowers() {
+ return null;
+ }
@Override
- public List<String> getGroups() { return null; }
-
+ public List<String> getGroups() {
+ return null;
+ }
};
final String id = RaftPeerId.valueOf(name).toString();
final String groupId = RaftGroupId.randomId().toString();
diff --git
a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/TestRaftLogMetrics.java
b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/TestRaftLogMetrics.java
index 65493d7a3..6f57d42a5 100644
---
a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/TestRaftLogMetrics.java
+++
b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/TestRaftLogMetrics.java
@@ -110,7 +110,8 @@ public class TestRaftLogMetrics extends BaseTest
}
// Wait for commits to happen on leader
- JavaUtils.attempt(() -> assertCommitCount(cluster.getLeader(), numMsg),
10, HUNDRED_MILLIS, cluster.getLeader().getId() + "-assertCommitCount", null);
+ JavaUtils.attempt(() -> assertCommitCount(cluster.getLeader(), numMsg),
10, HUNDRED_MILLIS,
+ cluster.getLeader().getId() + "-assertCommitCount", null);
}
static void assertCommitCount(RaftServer.Division server, int expectedMsgs) {
@@ -147,7 +148,8 @@ public class TestRaftLogMetrics extends BaseTest
}
static void assertRaftLogWritePathMetrics(RaftServer.Division server) throws
Exception {
- final String syncTimeMetric =
RaftStorageTestUtils.getRaftLogFullMetric(server.getMemberId().toString(),
RAFT_LOG_SYNC_TIME);
+ final String syncTimeMetric =
RaftStorageTestUtils.getRaftLogFullMetric(server.getMemberId().toString(),
+ RAFT_LOG_SYNC_TIME);
final RatisMetricRegistryImpl ratisMetricRegistry =
getRegistry(server.getMemberId());
//Test sync count
@@ -173,13 +175,16 @@ public class TestRaftLogMetrics extends BaseTest
Assertions.assertTrue(ratisMetricRegistry.counter(RAFT_LOG_FLUSH_COUNT).getCount()
> 0);
Assertions.assertTrue(ratisMetricRegistry.counter(RAFT_LOG_APPEND_ENTRY_COUNT).getCount()
> 0);
- final DefaultTimekeeperImpl appendEntry = (DefaultTimekeeperImpl)
ratisMetricRegistry.timer(RAFT_LOG_APPEND_ENTRY_LATENCY);
+ final DefaultTimekeeperImpl appendEntry =
+ (DefaultTimekeeperImpl)
ratisMetricRegistry.timer(RAFT_LOG_APPEND_ENTRY_LATENCY);
Assertions.assertTrue(appendEntry.getTimer().getMeanRate() > 0);
- final DefaultTimekeeperImpl taskQueue = (DefaultTimekeeperImpl)
ratisMetricRegistry.timer(RAFT_LOG_TASK_QUEUE_TIME);
+ final DefaultTimekeeperImpl taskQueue =
+ (DefaultTimekeeperImpl)
ratisMetricRegistry.timer(RAFT_LOG_TASK_QUEUE_TIME);
Assertions.assertTrue(taskQueue.getTimer().getMeanRate() > 0);
- final DefaultTimekeeperImpl enqueueDelay = (DefaultTimekeeperImpl)
ratisMetricRegistry.timer(RAFT_LOG_TASK_ENQUEUE_DELAY);
+ final DefaultTimekeeperImpl enqueueDelay =
+ (DefaultTimekeeperImpl)
ratisMetricRegistry.timer(RAFT_LOG_TASK_ENQUEUE_DELAY);
Assertions.assertTrue(enqueueDelay.getTimer().getMeanRate() > 0);
final DefaultTimekeeperImpl write = (DefaultTimekeeperImpl)
ratisMetricRegistry.timer(
diff --git
a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestBufferedWriteChannel.java
b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestBufferedWriteChannel.java
index cefd5f674..4df5f4992 100644
---
a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestBufferedWriteChannel.java
+++
b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestBufferedWriteChannel.java
@@ -54,7 +54,7 @@ public class TestBufferedWriteChannel extends BaseTest {
}
@Override
- public int read(ByteBuffer dst, long position) {
+ public int read(ByteBuffer dst, long pos) {
throw new UnsupportedOperationException();
}
@@ -64,7 +64,7 @@ public class TestBufferedWriteChannel extends BaseTest {
}
@Override
- public int write(ByteBuffer src, long position) {
+ public int write(ByteBuffer src, long pos) {
throw new UnsupportedOperationException();
}
@@ -103,27 +103,27 @@ public class TestBufferedWriteChannel extends BaseTest {
}
@Override
- public long transferTo(long position, long count, WritableByteChannel
target) {
+ public long transferTo(long pos, long count, WritableByteChannel target) {
throw new UnsupportedOperationException();
}
@Override
- public long transferFrom(ReadableByteChannel src, long position, long
count) {
+ public long transferFrom(ReadableByteChannel src, long pos, long count) {
throw new UnsupportedOperationException();
}
@Override
- public MappedByteBuffer map(MapMode mode, long position, long size) {
+ public MappedByteBuffer map(MapMode mode, long pos, long size) {
throw new UnsupportedOperationException();
}
@Override
- public FileLock lock(long position, long size, boolean shared) {
+ public FileLock lock(long pos, long size, boolean shared) {
throw new UnsupportedOperationException();
}
@Override
- public FileLock tryLock(long position, long size, boolean shared) {
+ public FileLock tryLock(long pos, long size, boolean shared) {
throw new UnsupportedOperationException();
}
diff --git
a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestLogSegment.java
b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestLogSegment.java
index 7692ad06b..608ff9f9c 100644
---
a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestLogSegment.java
+++
b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestLogSegment.java
@@ -88,7 +88,8 @@ public class TestLogSegment extends BaseTest {
File prepareLog(boolean isOpen, long startIndex, int numEntries, long term,
boolean isLastEntryPartiallyWritten)
throws IOException {
if (!isOpen) {
- Preconditions.assertTrue(!isLastEntryPartiallyWritten, "For closed log,
the last entry cannot be partially written.");
+ Preconditions.assertTrue(!isLastEntryPartiallyWritten,
+ "For closed log, the last entry cannot be partially written.");
}
RaftStorage storage = RaftStorageTestUtils.newRaftStorage(storageDir);
final File file = LogSegmentStartEnd.valueOf(startIndex, startIndex +
numEntries - 1, isOpen).getFile(storage);
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 5b1a8beec..5779a9347 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
@@ -266,7 +266,8 @@ public class TestSegmentedRaftLog extends BaseTest {
return eList;
}
- static LogEntryProto prepareLogEntry(long term, long index, Supplier<String>
stringSupplier, boolean hasStataMachineData) {
+ static LogEntryProto prepareLogEntry(long term, long index, Supplier<String>
stringSupplier,
+ boolean hasStataMachineData) {
final SimpleOperation m = stringSupplier == null?
new SimpleOperation("m" + index, hasStataMachineData):
new SimpleOperation(stringSupplier.get(), hasStataMachineData);
@@ -517,7 +518,8 @@ public class TestSegmentedRaftLog extends BaseTest {
purgeAndVerify(startTerm, endTerm, segmentSize, 1000,
endIndexOfClosedSegment, expectedIndex);
}
- private void purgeAndVerify(int startTerm, int endTerm, int segmentSize, int
purgeGap, long purgeIndex, long expectedIndex) throws Exception {
+ private void purgeAndVerify(int startTerm, int endTerm, int segmentSize, int
purgeGap, long purgeIndex,
+ long expectedIndex) throws Exception {
List<SegmentRange> ranges = prepareRanges(startTerm, endTerm, segmentSize,
0);
List<LogEntryProto> entries = prepareLogEntries(ranges, null);
@@ -546,7 +548,8 @@ public class TestSegmentedRaftLog extends BaseTest {
List<LogEntryProto> entries = prepareLogEntries(ranges, null);
final RetryCache retryCache = RetryCacheTestUtil.createRetryCache();
- try (SegmentedRaftLog raftLog =
RetryCacheTestUtil.newSegmentedRaftLog(MEMBER_ID, retryCache, storage,
properties)) {
+ try (SegmentedRaftLog raftLog =
+ RetryCacheTestUtil.newSegmentedRaftLog(MEMBER_ID, retryCache,
storage, properties)) {
raftLog.open(RaftLog.INVALID_LOG_INDEX, null);
entries.forEach(entry -> RetryCacheTestUtil.createEntry(retryCache,
entry));
// append entries to the raftlog
@@ -561,7 +564,8 @@ public class TestSegmentedRaftLog extends BaseTest {
List<LogEntryProto> newEntries = prepareLogEntries(
Arrays.asList(r1, r2, r3), null);
- try (SegmentedRaftLog raftLog =
RetryCacheTestUtil.newSegmentedRaftLog(MEMBER_ID, retryCache, storage,
properties)) {
+ try (SegmentedRaftLog raftLog =
+ RetryCacheTestUtil.newSegmentedRaftLog(MEMBER_ID, retryCache,
storage, properties)) {
raftLog.open(RaftLog.INVALID_LOG_INDEX, null);
LOG.info("newEntries[0] = {}", newEntries.get(0));
final int last = newEntries.size() - 1;
@@ -578,7 +582,8 @@ public class TestSegmentedRaftLog extends BaseTest {
}
// load the raftlog again and check
- try (SegmentedRaftLog raftLog =
RetryCacheTestUtil.newSegmentedRaftLog(MEMBER_ID, retryCache, storage,
properties)) {
+ try (SegmentedRaftLog raftLog =
+ RetryCacheTestUtil.newSegmentedRaftLog(MEMBER_ID, retryCache,
storage, properties)) {
raftLog.open(RaftLog.INVALID_LOG_INDEX, null);
checkEntries(raftLog, entries, 0, 650);
checkEntries(raftLog, newEntries, 100, 100);
@@ -709,7 +714,8 @@ public class TestSegmentedRaftLog extends BaseTest {
Assertions.assertEquals(expectedNextIndex, raftLog.getNextIndex());
}
- void assertIndicesMultipleAttempts(RaftLog raftLog, long expectedFlushIndex,
long expectedNextIndex) throws Exception {
+ void assertIndicesMultipleAttempts(RaftLog raftLog, long expectedFlushIndex,
long expectedNextIndex)
+ throws Exception {
JavaUtils.attempt(() -> assertIndices(raftLog, expectedFlushIndex,
expectedNextIndex),
10, HUNDRED_MILLIS, "assertIndices", LOG);
}
diff --git
a/ratis-test/src/test/java/org/apache/ratis/shell/cli/sh/LocalCommandIntegrationTest.java
b/ratis-test/src/test/java/org/apache/ratis/shell/cli/sh/LocalCommandIntegrationTest.java
index a85c247d6..afc13837c 100644
---
a/ratis-test/src/test/java/org/apache/ratis/shell/cli/sh/LocalCommandIntegrationTest.java
+++
b/ratis-test/src/test/java/org/apache/ratis/shell/cli/sh/LocalCommandIntegrationTest.java
@@ -61,14 +61,16 @@ public class LocalCommandIntegrationTest {
testDuplicatedPeers(duplicatedIdsList, "ID", "peer1_ID1");
}
- private void testDuplicatedPeers(String[] peersList, String
expectedErrorMessagePart, String expectedDuplicatedValue) throws Exception {
+ private void testDuplicatedPeers(String[] peersList, String
expectedErrorMessagePart, String expectedDuplicatedValue)
+ throws Exception {
for (String peersStr : peersList) {
StringPrintStream out = new StringPrintStream();
RatisShell shell = new RatisShell(out.getPrintStream());
int ret = shell.run("local", "raftMetaConf", "-peers", peersStr,
"-path", "test");
Assertions.assertEquals(-1, ret);
String message = out.toString().trim();
- Assertions.assertEquals(String.format("Found duplicated %s: %s. Please
make sure the %s of peer have no duplicated value.",
+ Assertions.assertEquals(
+ String.format("Found duplicated %s: %s. Please make sure the %s of
peer have no duplicated value.",
expectedErrorMessagePart, expectedDuplicatedValue,
expectedErrorMessagePart), message);
}
}
@@ -101,8 +103,8 @@ public class LocalCommandIntegrationTest {
String addressRegex = "^[a-zA-Z0-9.-]+:\\d+$";
Pattern pattern = Pattern.compile(addressRegex);
- peers.forEach(p -> Assertions.assertTrue(
- pattern.matcher(p.getAddress()).matches()));
+ peers.forEach(peerProto -> Assertions.assertTrue(
+ pattern.matcher(peerProto.getAddress()).matches()));
String peersListStrFromNewMetaConf;
if (containsPeerId(peersListStr)) {
diff --git a/ratis-test/src/test/java/org/apache/ratis/util/TestLifeCycle.java
b/ratis-test/src/test/java/org/apache/ratis/util/TestLifeCycle.java
index f08ceb346..36ef250bf 100644
--- a/ratis-test/src/test/java/org/apache/ratis/util/TestLifeCycle.java
+++ b/ratis-test/src/test/java/org/apache/ratis/util/TestLifeCycle.java
@@ -82,7 +82,8 @@ public class TestLifeCycle {
testInvalidTransition((from, subject, to) -> subject.transitionAndGet(any
-> to), true);
}
- private static void testInvalidTransition(TriConsumer<LifeCycle.State,
LifeCycle, LifeCycle.State> op, boolean shouldThrow) {
+ private static void testInvalidTransition(TriConsumer<LifeCycle.State,
LifeCycle, LifeCycle.State> op,
+ boolean shouldThrow) {
LifeCycle subject = new LifeCycle("subject");
for (LifeCycle.State to : new LifeCycle.State[] { RUNNING, EXCEPTION,
CLOSING }) {
LifeCycle.State from = subject.getCurrentState();
diff --git a/ratis-test/src/test/java/org/apache/ratis/util/TestMinMax.java
b/ratis-test/src/test/java/org/apache/ratis/util/TestMinMax.java
index 07a9882ad..0329a1ee9 100644
--- a/ratis-test/src/test/java/org/apache/ratis/util/TestMinMax.java
+++ b/ratis-test/src/test/java/org/apache/ratis/util/TestMinMax.java
@@ -43,7 +43,8 @@ public class TestMinMax {
static void runTestMinMax(LongStream stream) {
final List<Long> list = stream.collect(ArrayList::new, List::add,
List::addAll);
- final LongMinMax longMinMax = toLongStream(list).collect(LongMinMax::new,
LongMinMax::accumulate, LongMinMax::combine);
+ final LongMinMax longMinMax = toLongStream(list)
+ .collect(LongMinMax::new, LongMinMax::accumulate, LongMinMax::combine);
if (longMinMax.isInitialized()) {
Assertions.assertEquals(toLongStream(list).min().getAsLong(),
longMinMax.getMin());
Assertions.assertEquals(toLongStream(list).max().getAsLong(),
longMinMax.getMax());
