Skip to content

Commit 1451ec4

Browse files
committed
Address review comments.
1 parent be2ad90 commit 1451ec4

1 file changed

Lines changed: 8 additions & 10 deletions

File tree

ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -226,15 +226,14 @@ void runTestBasicInstallSnapshot(CLUSTER cluster) throws Exception {
226226
Assertions.assertTrue(client.io().send(new SimpleMessage("m" + i)).isSuccess());
227227
}
228228

229-
// add two more peers
230-
final String[] newPeers = new String[]{"new0"};
231-
MiniRaftCluster.PeerChanges change = cluster.addNewPeers(newPeers, true, true);
229+
// add a new peer
230+
final MiniRaftCluster.PeerChanges change = cluster.addNewPeers(1, true, true);
232231
// trigger setConfiguration
233232
RaftServerTestUtil.runWithMinorityPeers(cluster, Arrays.asList(change.allPeersInNewConf),
234233
peers -> cluster.setConfiguration(peers.toArray(RaftPeer.emptyArray())));
235234

236-
for (String newPeer : newPeers) {
237-
final RaftServer.Division s = cluster.getDivision(RaftPeerId.valueOf(newPeer));
235+
for (RaftPeer newPeer : change.newPeers) {
236+
final RaftServer.Division s = cluster.getDivision(newPeer.getId());
238237
SimpleStateMachine4Testing simpleStateMachine = SimpleStateMachine4Testing.get(s);
239238
Assertions.assertSame(LifeCycle.State.RUNNING, simpleStateMachine.getLifeCycleState());
240239
}
@@ -293,15 +292,14 @@ void runTestInstallSnapshotDuringBootstrap(CLUSTER cluster) throws Exception {
293292

294293
assertLeaderContent(cluster);
295294

296-
// add two more peers
297-
final String[] newPeers = {"new0"};
298-
MiniRaftCluster.PeerChanges change = cluster.addNewPeers(newPeers, true, true);
295+
// add a new peer
296+
final MiniRaftCluster.PeerChanges change = cluster.addNewPeers(1, true, true);
299297
// trigger setConfiguration
300298
RaftServerTestUtil.runWithMinorityPeers(cluster, Arrays.asList(change.allPeersInNewConf),
301299
peers -> cluster.setConfiguration(peers.toArray(RaftPeer.emptyArray())));
302300

303-
for (String newPeer : newPeers) {
304-
final RaftServer.Division s = cluster.getDivision(RaftPeerId.valueOf(newPeer));
301+
for (RaftPeer newPeer : change.newPeers) {
302+
final RaftServer.Division s = cluster.getDivision(newPeer.getId());
305303
SimpleStateMachine4Testing simpleStateMachine = SimpleStateMachine4Testing.get(s);
306304
Assertions.assertSame(LifeCycle.State.RUNNING, simpleStateMachine.getLifeCycleState());
307305
}

0 commit comments

Comments
 (0)