Repository: incubator-ratis Updated Branches: refs/heads/master ddb82cd19 -> 466fc2c3a
http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/466fc2c3/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 fcb39dd..22e0564 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 @@ -22,6 +22,8 @@ import org.apache.ratis.MiniRaftCluster; import org.apache.ratis.RaftTestUtil; import org.apache.ratis.client.RaftClient; import org.apache.ratis.conf.RaftProperties; +import org.apache.ratis.protocol.RaftGroup; +import org.apache.ratis.protocol.RaftGroupId; import org.apache.ratis.protocol.RaftPeer; import org.apache.ratis.protocol.RaftPeerId; import org.apache.ratis.util.LogUtils; @@ -31,9 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -59,11 +59,11 @@ public abstract class ReinitializationBaseTest { LOG.info("Start testReinitialize" + cluster.printServers()); // Start server with an empty conf - final RaftConfiguration emptyConf = MiniRaftCluster.initConfiguration(Collections.emptyList()); + RaftGroup group = new RaftGroup(RaftGroupId.createId(), new RaftPeer[0]); - final List<RaftPeerId> ids = Arrays.asList(MiniRaftCluster.generateIds(3, 0)) - .stream().map(RaftPeerId::valueOf).collect(Collectors.toList()); - ids.stream().forEach(id -> cluster.putNewServer(id, emptyConf, true)); + final List<RaftPeerId> ids = Arrays.stream(MiniRaftCluster.generateIds(3, 0)) + .map(RaftPeerId::valueOf).collect(Collectors.toList()); + ids.forEach(id -> cluster.putNewServer(id, group, true)); LOG.info("putNewServer: " + cluster.printServers()); cluster.start(); @@ -76,7 +76,8 @@ public abstract class ReinitializationBaseTest { // Reinitialize servers final RaftPeer[] peers = cluster.getPeers().toArray(RaftPeer.EMPTY_PEERS); for(RaftPeer p : peers) { - final RaftClient client = cluster.createClient(p.getId(), new ArrayList<>(Arrays.asList(p))); + final RaftClient client = cluster.createClient(p.getId(), + new RaftGroup(RaftGroupId.createId(), new RaftPeer[]{p})); client.reinitialize(peers, p.getId()); } Assert.assertNotNull(RaftTestUtil.waitForLeader(cluster, true)); http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/466fc2c3/ratis-server/src/test/java/org/apache/ratis/server/simulation/MiniRaftClusterWithSimulatedRpc.java ---------------------------------------------------------------------- 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 1682b20..b3b679f 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 @@ -21,9 +21,8 @@ import org.apache.ratis.MiniRaftCluster; import org.apache.ratis.RaftConfigKeys; import org.apache.ratis.conf.ConfUtils; import org.apache.ratis.conf.RaftProperties; +import org.apache.ratis.protocol.RaftGroup; import org.apache.ratis.protocol.RaftPeerId; -import org.apache.ratis.server.impl.RaftConfiguration; -import org.apache.ratis.server.impl.RaftServerImpl; import org.apache.ratis.server.impl.RaftServerProxy; import org.apache.ratis.server.impl.ServerImplUtils; import org.apache.ratis.statemachine.StateMachine; @@ -82,11 +81,11 @@ public class MiniRaftClusterWithSimulatedRpc extends MiniRaftCluster { @Override protected RaftServerProxy newRaftServer( - RaftPeerId id, StateMachine stateMachine, RaftConfiguration conf, + RaftPeerId id, StateMachine stateMachine, RaftGroup group, RaftProperties properties) throws IOException { serverRequestReply.addPeer(id); client2serverRequestReply.addPeer(id); - return ServerImplUtils.newRaftServer(id, stateMachine, conf, properties, + return ServerImplUtils.newRaftServer(id, group, stateMachine, properties, parameters); } http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/466fc2c3/ratis-server/src/test/java/org/apache/ratis/server/simulation/RaftServerReply.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/server/simulation/RaftServerReply.java b/ratis-server/src/test/java/org/apache/ratis/server/simulation/RaftServerReply.java index 7882fcc..10d6272 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/simulation/RaftServerReply.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/simulation/RaftServerReply.java @@ -17,6 +17,7 @@ */ package org.apache.ratis.server.simulation; +import org.apache.ratis.protocol.RaftGroupId; import org.apache.ratis.protocol.RaftRpcMessage; import org.apache.ratis.shaded.proto.RaftProtos.AppendEntriesReplyProto; import org.apache.ratis.shaded.proto.RaftProtos.InstallSnapshotReplyProto; @@ -97,4 +98,15 @@ public class RaftServerReply implements RaftRpcMessage { return installSnapshot.getServerReply().getReplyId().toStringUtf8(); } } + + @Override + public RaftGroupId getRaftGroupId() { + if (isAppendEntries()) { + return new RaftGroupId(appendEntries.getServerReply().getRaftGroupId().toByteArray()); + } else if (isRequestVote()) { + return new RaftGroupId(requestVote.getServerReply().getRaftGroupId().toByteArray()); + } else { + return new RaftGroupId(installSnapshot.getServerReply().getRaftGroupId().toByteArray()); + } + } } http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/466fc2c3/ratis-server/src/test/java/org/apache/ratis/server/simulation/RaftServerRequest.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/server/simulation/RaftServerRequest.java b/ratis-server/src/test/java/org/apache/ratis/server/simulation/RaftServerRequest.java index 366df84..f9d3d31 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/simulation/RaftServerRequest.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/simulation/RaftServerRequest.java @@ -17,6 +17,7 @@ */ package org.apache.ratis.server.simulation; +import org.apache.ratis.protocol.RaftGroupId; import org.apache.ratis.protocol.RaftRpcMessage; import org.apache.ratis.shaded.proto.RaftProtos.AppendEntriesRequestProto; import org.apache.ratis.shaded.proto.RaftProtos.InstallSnapshotRequestProto; @@ -95,4 +96,15 @@ class RaftServerRequest implements RaftRpcMessage { return installSnapshot.getServerRequest().getReplyId().toStringUtf8(); } } + + @Override + public RaftGroupId getRaftGroupId() { + if (isAppendEntries()) { + return new RaftGroupId(appendEntries.getServerRequest().getRaftGroupId().getId().toByteArray()); + } else if (isRequestVote()) { + return new RaftGroupId(requestVote.getServerRequest().getRaftGroupId().getId().toByteArray()); + } else { + return new RaftGroupId(installSnapshot.getServerRequest().getRaftGroupId().getId().toByteArray()); + } + } } http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/466fc2c3/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 1db5821..c7adec8 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 { new String[]{"s3", "s4"}, true); // trigger setConfiguration SetConfigurationRequest request = new SetConfigurationRequest(ClientId.createId(), - cluster.getLeader().getId(), DEFAULT_CALLID, change.allPeersInNewConf); + cluster.getLeader().getId(), cluster.getGroupId(), DEFAULT_CALLID, change.allPeersInNewConf); LOG.info("Start changing the configuration: {}", request); cluster.getLeader().setConfiguration(request);
