Repository: incubator-ratis Updated Branches: refs/heads/master e46aee2c8 -> fd230c448
RATIS-110. Add a static valueOf method to ClientId and RaftGroupId. Contributed by Chen Liang Project: http://git-wip-us.apache.org/repos/asf/incubator-ratis/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ratis/commit/fd230c44 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ratis/tree/fd230c44 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ratis/diff/fd230c44 Branch: refs/heads/master Commit: fd230c448b88becb79a216cd0cc0571a3ab9b0c4 Parents: e46aee2 Author: Tsz-Wo Nicholas Sze <[email protected]> Authored: Sat Sep 2 10:28:21 2017 +0800 Committer: Tsz-Wo Nicholas Sze <[email protected]> Committed: Sat Sep 2 10:28:21 2017 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/ratis/client/RaftClient.java | 2 +- .../org/apache/ratis/client/impl/ClientProtoUtils.java | 8 ++++---- .../main/java/org/apache/ratis/protocol/ClientId.java | 12 ++++++++---- .../java/org/apache/ratis/protocol/RaftGroupId.java | 13 ++++++++----- .../main/java/org/apache/ratis/util/ProtoUtils.java | 2 +- .../java/org/apache/ratis/grpc/TestRaftStream.java | 10 ++++------ .../org/apache/ratis/server/impl/RaftServerImpl.java | 2 +- .../org/apache/ratis/server/impl/ServerProtoUtils.java | 2 +- .../test/java/org/apache/ratis/MiniRaftCluster.java | 2 +- .../apache/ratis/RaftNotLeaderExceptionBaseTest.java | 4 ++-- .../java/org/apache/ratis/protocol/TestRaftId.java | 8 ++++---- .../ratis/server/impl/RaftReconfigurationBaseTest.java | 2 +- .../ratis/server/impl/ReinitializationBaseTest.java | 6 +++--- .../apache/ratis/server/storage/TestCacheEviction.java | 2 +- .../apache/ratis/server/storage/TestRaftLogCache.java | 2 +- .../ratis/server/storage/TestRaftLogReadWrite.java | 2 +- .../ratis/server/storage/TestRaftLogSegment.java | 2 +- .../ratis/server/storage/TestSegmentedRaftLog.java | 2 +- .../ratis/statemachine/RaftSnapshotBaseTest.java | 2 +- 19 files changed, 45 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/fd230c44/ratis-client/src/main/java/org/apache/ratis/client/RaftClient.java ---------------------------------------------------------------------- diff --git a/ratis-client/src/main/java/org/apache/ratis/client/RaftClient.java b/ratis-client/src/main/java/org/apache/ratis/client/RaftClient.java index 44fc186..0effc4e 100644 --- a/ratis-client/src/main/java/org/apache/ratis/client/RaftClient.java +++ b/ratis-client/src/main/java/org/apache/ratis/client/RaftClient.java @@ -73,7 +73,7 @@ public interface RaftClient extends Closeable { /** @return a {@link RaftClient} object. */ public RaftClient build() { if (clientId == null) { - clientId = ClientId.createId(); + clientId = ClientId.randomId(); } if (properties != null) { retryInterval = RaftClientConfigKeys.Rpc.timeout(properties); http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/fd230c44/ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java ---------------------------------------------------------------------- diff --git a/ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java b/ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java index bfb25be..e6621de 100644 --- a/ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java +++ b/ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java @@ -68,7 +68,7 @@ public class ClientProtoUtils { public static RaftClientRequest toRaftClientRequest(RaftClientRequestProto p) { final RaftRpcRequestProto request = p.getRpcRequest(); return new RaftClientRequest( - new ClientId(request.getRequestorId()), + ClientId.valueOf(request.getRequestorId()), RaftPeerId.valueOf(request.getReplyId()), ProtoUtils.toRaftGroupId(request.getRaftGroupId()), request.getCallId(), @@ -148,7 +148,7 @@ public class ClientProtoUtils { smeProto.getExceptionClassName(), smeProto.getErrorMsg(), smeProto.getStacktrace()); } - ClientId clientId = new ClientId(rp.getRequestorId()); + ClientId clientId = ClientId.valueOf(rp.getRequestorId()); final RaftGroupId groupId = ProtoUtils.toRaftGroupId(rp.getRaftGroupId()); return new RaftClientReply(clientId, RaftPeerId.valueOf(rp.getReplyId()), groupId, rp.getCallId(), rp.getSuccess(), @@ -194,7 +194,7 @@ public class ClientProtoUtils { final RaftRpcRequestProto m = p.getRpcRequest(); final RaftPeer[] peers = ProtoUtils.toRaftPeerArray(p.getPeersList()); return new SetConfigurationRequest( - new ClientId(m.getRequestorId()), + ClientId.valueOf(m.getRequestorId()), RaftPeerId.valueOf(m.getReplyId()), ProtoUtils.toRaftGroupId(m.getRaftGroupId()), p.getRpcRequest().getCallId(), peers); @@ -213,7 +213,7 @@ public class ClientProtoUtils { ReinitializeRequestProto p) { final RaftRpcRequestProto m = p.getRpcRequest(); return new ReinitializeRequest( - new ClientId(m.getRequestorId()), + ClientId.valueOf(m.getRequestorId()), RaftPeerId.valueOf(m.getReplyId()), ProtoUtils.toRaftGroupId(m.getRaftGroupId()), m.getCallId(), http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/fd230c44/ratis-common/src/main/java/org/apache/ratis/protocol/ClientId.java ---------------------------------------------------------------------- diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/ClientId.java b/ratis-common/src/main/java/org/apache/ratis/protocol/ClientId.java index 9b42076..d719884 100644 --- a/ratis-common/src/main/java/org/apache/ratis/protocol/ClientId.java +++ b/ratis-common/src/main/java/org/apache/ratis/protocol/ClientId.java @@ -26,12 +26,16 @@ import java.util.UUID; * to correctly identify retry requests from the same client. */ public class ClientId extends RaftId { - public static ClientId createId() { - UUID uuid = UUID.randomUUID(); - return new ClientId(uuid); + + public static ClientId randomId() { + return new ClientId(UUID.randomUUID()); + } + + public static ClientId valueOf(ByteString data) { + return new ClientId(data); } - public ClientId(ByteString data) { + private ClientId(ByteString data) { super(data); } http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/fd230c44/ratis-common/src/main/java/org/apache/ratis/protocol/RaftGroupId.java ---------------------------------------------------------------------- diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/RaftGroupId.java b/ratis-common/src/main/java/org/apache/ratis/protocol/RaftGroupId.java index a7ea70d..0ddc7dc 100644 --- a/ratis-common/src/main/java/org/apache/ratis/protocol/RaftGroupId.java +++ b/ratis-common/src/main/java/org/apache/ratis/protocol/RaftGroupId.java @@ -23,16 +23,19 @@ import java.util.UUID; public class RaftGroupId extends RaftId { - public static RaftGroupId createId() { - UUID uuid = UUID.randomUUID(); - return new RaftGroupId(uuid); + public static RaftGroupId randomId() { + return new RaftGroupId(UUID.randomUUID()); } - protected RaftGroupId(UUID id) { + public static RaftGroupId valueOf(ByteString data) { + return new RaftGroupId(data); + } + + private RaftGroupId(UUID id) { super(id); } - public RaftGroupId(ByteString data) { + private RaftGroupId(ByteString data) { super(data); } http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/fd230c44/ratis-common/src/main/java/org/apache/ratis/util/ProtoUtils.java ---------------------------------------------------------------------- diff --git a/ratis-common/src/main/java/org/apache/ratis/util/ProtoUtils.java b/ratis-common/src/main/java/org/apache/ratis/util/ProtoUtils.java index 7e849fd..73e8646 100644 --- a/ratis-common/src/main/java/org/apache/ratis/util/ProtoUtils.java +++ b/ratis-common/src/main/java/org/apache/ratis/util/ProtoUtils.java @@ -101,7 +101,7 @@ public class ProtoUtils { } public static RaftGroupId toRaftGroupId(RaftGroupIdProto proto) { - return new RaftGroupId(proto.getId()); + return RaftGroupId.valueOf(proto.getId()); } public static RaftGroupIdProto.Builder toRaftGroupIdProtoBuilder(RaftGroupId id) { http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/fd230c44/ratis-grpc/src/test/java/org/apache/ratis/grpc/TestRaftStream.java ---------------------------------------------------------------------- diff --git a/ratis-grpc/src/test/java/org/apache/ratis/grpc/TestRaftStream.java b/ratis-grpc/src/test/java/org/apache/ratis/grpc/TestRaftStream.java index ccd6c10..b9df622 100644 --- a/ratis-grpc/src/test/java/org/apache/ratis/grpc/TestRaftStream.java +++ b/ratis-grpc/src/test/java/org/apache/ratis/grpc/TestRaftStream.java @@ -32,8 +32,6 @@ import org.apache.ratis.server.storage.RaftLog; import org.junit.After; import org.junit.Assert; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.*; @@ -89,7 +87,7 @@ public class TestRaftStream extends BaseTest { final Random r = new Random(); final long seed = r.nextLong(); r.setSeed(seed); - try (RaftOutputStream out = new RaftOutputStream(prop, ClientId.createId(), + try (RaftOutputStream out = new RaftOutputStream(prop, ClientId.randomId(), cluster.getGroup(), leader.getId())) { for (int i = 0; i < 500; i++) { // generate 500 requests out.write(toBytes(r.nextInt())); @@ -126,7 +124,7 @@ public class TestRaftStream extends BaseTest { cluster.start(); RaftServerImpl leader = waitForLeader(cluster); - RaftOutputStream out = new RaftOutputStream(prop, ClientId.createId(), + RaftOutputStream out = new RaftOutputStream(prop, ClientId.randomId(), cluster.getGroup(), leader.getId()); int[] lengths = new int[]{1, 500, 1023, 1024, 1025, 2048, 3000, 3072}; @@ -205,7 +203,7 @@ public class TestRaftStream extends BaseTest { cluster.start(); RaftServerImpl leader = waitForLeader(cluster); - RaftOutputStream out = new RaftOutputStream(prop, ClientId.createId(), + RaftOutputStream out = new RaftOutputStream(prop, ClientId.randomId(), cluster.getGroup(), leader.getId()); byte[] b1 = new byte[ByteValue.BUFFERSIZE / 2]; @@ -271,7 +269,7 @@ public class TestRaftStream extends BaseTest { new Thread(() -> { LOG.info("Writer thread starts"); int count = 0; - try (RaftOutputStream out = new RaftOutputStream(prop, ClientId.createId(), + try (RaftOutputStream out = new RaftOutputStream(prop, ClientId.randomId(), cluster.getGroup(), leader.getId())) { while (running.get()) { out.write(toBytes(count++)); http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/fd230c44/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java ---------------------------------------------------------------------- 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 9e9215b..14acfb4 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 @@ -890,7 +890,7 @@ public class RaftServerImpl implements RaftServerProtocol, private void replyPendingRequest(LogEntryProto logEntry, CompletableFuture<Message> stateMachineFuture) { // update the retry cache - final ClientId clientId = new ClientId(logEntry.getClientId()); + final ClientId clientId = ClientId.valueOf(logEntry.getClientId()); final long callId = logEntry.getCallId(); final RaftPeerId serverId = getId(); final RetryCache.CacheEntry cacheEntry = retryCache.getOrCreateEntry( http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/fd230c44/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerProtoUtils.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerProtoUtils.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerProtoUtils.java index 193ac83..bca6cbb 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerProtoUtils.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerProtoUtils.java @@ -59,7 +59,7 @@ public class ServerProtoUtils { private static String toLogEntryString(LogEntryProto entry) { final ByteString clientId = entry.getClientId(); return toTermIndexString(entry) + entry.getLogEntryBodyCase() - + ", " + (clientId.isEmpty()? "<empty clientId>": new ClientId(clientId)) + + ", " + (clientId.isEmpty()? "<empty clientId>": ClientId.valueOf(clientId)) + ", callId=" + entry.getCallId(); } http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/fd230c44/ratis-server/src/test/java/org/apache/ratis/MiniRaftCluster.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/MiniRaftCluster.java b/ratis-server/src/test/java/org/apache/ratis/MiniRaftCluster.java index 31d16fe..b527a58 100644 --- a/ratis-server/src/test/java/org/apache/ratis/MiniRaftCluster.java +++ b/ratis-server/src/test/java/org/apache/ratis/MiniRaftCluster.java @@ -101,7 +101,7 @@ public abstract class MiniRaftCluster { .map(RaftPeerId::valueOf) .map(id -> new RaftPeer(id, NetUtils.createLocalServerAddress())) .toArray(RaftPeer[]::new); - return new RaftGroup(RaftGroupId.createId(), peers); + return new RaftGroup(RaftGroupId.randomId(), peers); } private File getStorageDir(RaftPeerId id) { http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/fd230c44/ratis-server/src/test/java/org/apache/ratis/RaftNotLeaderExceptionBaseTest.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/RaftNotLeaderExceptionBaseTest.java b/ratis-server/src/test/java/org/apache/ratis/RaftNotLeaderExceptionBaseTest.java index 119409c..583aac7 100644 --- a/ratis-server/src/test/java/org/apache/ratis/RaftNotLeaderExceptionBaseTest.java +++ b/ratis-server/src/test/java/org/apache/ratis/RaftNotLeaderExceptionBaseTest.java @@ -96,7 +96,7 @@ public abstract class RaftNotLeaderExceptionBaseTest extends BaseTest { for (int i = 0; reply == null && i < 10; i++) { try { reply = rpc.sendRequest( - new RaftClientRequest(ClientId.createId(), leaderId, + new RaftClientRequest(ClientId.randomId(), leaderId, cluster.getGroupId(), DEFAULT_CALLID, new SimpleMessage("m2"))); } catch (IOException ignored) { @@ -144,7 +144,7 @@ public abstract class RaftNotLeaderExceptionBaseTest extends BaseTest { for (int i = 0; reply == null && i < 10; i++) { try { reply = rpc.sendRequest( - new RaftClientRequest(ClientId.createId(), leaderId, + new RaftClientRequest(ClientId.randomId(), leaderId, cluster.getGroupId(), DEFAULT_CALLID, new SimpleMessage("m1"))); } catch (IOException ignored) { http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/fd230c44/ratis-server/src/test/java/org/apache/ratis/protocol/TestRaftId.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/protocol/TestRaftId.java b/ratis-server/src/test/java/org/apache/ratis/protocol/TestRaftId.java index b4688fd..e83e32a 100644 --- a/ratis-server/src/test/java/org/apache/ratis/protocol/TestRaftId.java +++ b/ratis-server/src/test/java/org/apache/ratis/protocol/TestRaftId.java @@ -30,18 +30,18 @@ public class TestRaftId extends BaseTest { @Test public void testClientId() { - final ClientId id = ClientId.createId(); + final ClientId id = ClientId.randomId(); final ByteString bytes = id.toByteString(); Assert.assertEquals(bytes, id.toByteString()); - Assert.assertEquals(id, new ClientId(bytes)); + Assert.assertEquals(id, ClientId.valueOf(bytes)); } @Test public void testRaftGroupId() { - final RaftGroupId id = RaftGroupId.createId(); + final RaftGroupId id = RaftGroupId.randomId(); final ByteString bytes = id.toByteString(); Assert.assertEquals(bytes, id.toByteString()); - Assert.assertEquals(id, new RaftGroupId(bytes)); + Assert.assertEquals(id, RaftGroupId.valueOf(bytes)); } @Test http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/fd230c44/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java ---------------------------------------------------------------------- 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 316377b..780ce79 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 @@ -64,7 +64,7 @@ public abstract class RaftReconfigurationBaseTest extends BaseTest { protected static final RaftProperties prop = new RaftProperties(); - private static final ClientId clientId = ClientId.createId(); + private static final ClientId clientId = ClientId.randomId(); static final int STAGING_CATCHUP_GAP = 10; @BeforeClass http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/fd230c44/ratis-server/src/test/java/org/apache/ratis/server/impl/ReinitializationBaseTest.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/server/impl/ReinitializationBaseTest.java b/ratis-server/src/test/java/org/apache/ratis/server/impl/ReinitializationBaseTest.java index 5595b76..5bc8dbe 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/impl/ReinitializationBaseTest.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/impl/ReinitializationBaseTest.java @@ -61,7 +61,7 @@ public abstract class ReinitializationBaseTest extends BaseTest { LOG.info("Start testReinitialize" + cluster.printServers()); // Start server with an empty conf - final RaftGroupId groupId = RaftGroupId.createId(); + final RaftGroupId groupId = RaftGroupId.randomId(); final RaftGroup group = new RaftGroup(groupId); final List<RaftPeerId> ids = Arrays.stream(MiniRaftCluster.generateIds(3, 0)) @@ -116,7 +116,7 @@ public abstract class ReinitializationBaseTest extends BaseTest { LOG.info("\n\nrunTestReinitializeMultiGroups with " + type + ": " + cluster.printServers()); // Start server with an empty conf - final RaftGroup emptyGroup = new RaftGroup(RaftGroupId.createId()); + final RaftGroup emptyGroup = new RaftGroup(RaftGroupId.randomId()); final List<RaftPeerId> ids = Arrays.stream(MiniRaftCluster.generateIds(idIndex[idIndex.length - 1], 0)) .map(RaftPeerId::valueOf).collect(Collectors.toList()); @@ -135,7 +135,7 @@ public abstract class ReinitializationBaseTest extends BaseTest { Collections.sort(allPeers, Comparator.comparing(p -> p.getId().toString())); final RaftGroup[] groups = new RaftGroup[idIndex.length]; for (int i = 0; i < idIndex.length; i++) { - final RaftGroupId gid = RaftGroupId.createId(); + final RaftGroupId gid = RaftGroupId.randomId(); final int previous = i == 0 ? 0 : idIndex[i - 1]; final RaftPeer[] peers = allPeers.subList(previous, idIndex[i]).toArray(RaftPeer.EMPTY_PEERS); groups[i] = new RaftGroup(gid, peers); http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/fd230c44/ratis-server/src/test/java/org/apache/ratis/server/storage/TestCacheEviction.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/server/storage/TestCacheEviction.java b/ratis-server/src/test/java/org/apache/ratis/server/storage/TestCacheEviction.java index 456403e..8ce33f5 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/storage/TestCacheEviction.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/storage/TestCacheEviction.java @@ -44,7 +44,7 @@ import java.util.List; public class TestCacheEviction extends BaseTest { private static final CacheInvalidationPolicy policy = new CacheInvalidationPolicyDefault(); - private static final ClientId clientId = ClientId.createId(); + private static final ClientId clientId = ClientId.randomId(); private static final long callId = 0; private List<LogSegment> prepareSegments(int numSegments, boolean[] cached, long start, long size) { http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/fd230c44/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogCache.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogCache.java b/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogCache.java index 86333f0..c76fd4d 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogCache.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogCache.java @@ -32,7 +32,7 @@ import org.junit.Before; import org.junit.Test; public class TestRaftLogCache { - private static final ClientId clientId = ClientId.createId(); + private static final ClientId clientId = ClientId.randomId(); private static final long callId = 0; private static final RaftProperties prop = new RaftProperties(); http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/fd230c44/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogReadWrite.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogReadWrite.java b/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogReadWrite.java index dffd996..f742519 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogReadWrite.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogReadWrite.java @@ -47,7 +47,7 @@ import java.util.List; * Test basic functionality of LogReader, LogInputStream, and LogOutputStream. */ public class TestRaftLogReadWrite extends BaseTest { - private static final ClientId clientId = ClientId.createId(); + private static final ClientId clientId = ClientId.randomId(); private static final long callId = 0; private File storageDir; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/fd230c44/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogSegment.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogSegment.java b/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogSegment.java index 931a6ec..0366f28 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogSegment.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogSegment.java @@ -48,7 +48,7 @@ import static org.apache.ratis.server.storage.LogSegment.getEntrySize; * Test basic functionality of {@link LogSegment} */ public class TestRaftLogSegment extends BaseTest { - private static final ClientId clientId = ClientId.createId(); + private static final ClientId clientId = ClientId.randomId(); private static final long callId = 0; private File storageDir; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/fd230c44/ratis-server/src/test/java/org/apache/ratis/server/storage/TestSegmentedRaftLog.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/server/storage/TestSegmentedRaftLog.java b/ratis-server/src/test/java/org/apache/ratis/server/storage/TestSegmentedRaftLog.java index c6a97da..9385d19 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/storage/TestSegmentedRaftLog.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/storage/TestSegmentedRaftLog.java @@ -50,7 +50,7 @@ public class TestSegmentedRaftLog extends BaseTest { } private static final RaftPeerId peerId = RaftPeerId.valueOf("s0"); - private static final ClientId clientId = ClientId.createId(); + private static final ClientId clientId = ClientId.randomId(); private static final long callId = 0; static class SegmentRange { http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/fd230c44/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java ---------------------------------------------------------------------- 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 c243eaf..b51dd7c 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 @@ -197,7 +197,7 @@ public abstract class RaftSnapshotBaseTest extends BaseTest { MiniRaftCluster.PeerChanges change = cluster.addNewPeers( new String[]{"s3", "s4"}, true); // trigger setConfiguration - SetConfigurationRequest request = new SetConfigurationRequest(ClientId.createId(), + SetConfigurationRequest request = new SetConfigurationRequest(ClientId.randomId(), cluster.getLeader().getId(), cluster.getGroupId(), DEFAULT_CALLID, change.allPeersInNewConf); LOG.info("Start changing the configuration: {}", request); cluster.getLeader().setConfiguration(request);
