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 bc190b30 RATIS-1628. Fix 'Address already in use' failure in
TestMultiRaftGroup. (#685)
bc190b30 is described below
commit bc190b3038d1f4ce156f1a0d8b3f1f0ff236d22d
Author: Sammi Chen <[email protected]>
AuthorDate: Thu Jul 21 01:21:24 2022 +0800
RATIS-1628. Fix 'Address already in use' failure in TestMultiRaftGroup.
(#685)
---
.../ratis/server/impl/GroupManagementBaseTest.java | 126 +++++++++++----------
1 file changed, 64 insertions(+), 62 deletions(-)
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupManagementBaseTest.java
b/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupManagementBaseTest.java
index d15b3265..86481af2 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupManagementBaseTest.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupManagementBaseTest.java
@@ -264,77 +264,79 @@ public abstract class GroupManagementBaseTest extends
BaseTest {
LOG.info("start: " + cluster.printServers());
Assert.assertNull(cluster.getLeader());
- // Reinitialize servers to three groups
- final List<RaftPeer> allPeers = cluster.getPeers();
- 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.randomId();
- final int previous = i == 0 ? 0 : idIndex[i - 1];
- final RaftPeer[] peers = allPeers.subList(previous,
idIndex[i]).toArray(RaftPeer.emptyArray());
- groups[i] = RaftGroup.valueOf(gid, peers);
-
- LOG.info(i + ") starting " + groups[i]);
- for(RaftPeer p : peers) {
- try(final RaftClient client = cluster.createClient(p.getId(),
groups[i])) {
- client.getGroupManagementApi(p.getId()).add(groups[i]);
+ try {
+ // Reinitialize servers to three groups
+ final List<RaftPeer> allPeers = cluster.getPeers();
+ 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.randomId();
+ final int previous = i == 0 ? 0 : idIndex[i - 1];
+ final RaftPeer[] peers = allPeers.subList(previous,
idIndex[i]).toArray(RaftPeer.emptyArray());
+ groups[i] = RaftGroup.valueOf(gid, peers);
+
+ LOG.info(i + ") starting " + groups[i]);
+ for (RaftPeer p : peers) {
+ try (final RaftClient client = cluster.createClient(p.getId(),
groups[i])) {
+ client.getGroupManagementApi(p.getId()).add(groups[i]);
+ }
}
+ Assert.assertNotNull(RaftTestUtil.waitForLeader(cluster, gid));
+ checker.accept(cluster, groups[i]);
}
- Assert.assertNotNull(RaftTestUtil.waitForLeader(cluster, gid));
- checker.accept(cluster, groups[i]);
- }
- printThreadCount(type, "start groups");
- LOG.info("start groups: " + cluster.printServers());
-
- // randomly remove two of the groups
- LOG.info("chosen = " + chosen + ", " + groups[chosen]);
-
- for (int i = 0; i < groups.length; i++) {
- if (i != chosen) {
- final RaftGroup g = groups[i];
- LOG.info(i + ") close " + cluster.printServers(g.getGroupId()));
- for(RaftPeer p : g.getPeers()) {
- final RaftServer.Division d = cluster.getDivision(p.getId(),
g.getGroupId());
- final File root = d.getRaftStorage().getStorageDir().getRoot();
- Assert.assertTrue(root.exists());
- Assert.assertTrue(root.isDirectory());
-
- final RaftClientReply r;
- try (final RaftClient client = cluster.createClient(p.getId(), g)) {
- r = client.getGroupManagementApi(p.getId()).remove(g.getGroupId(),
true, false);
+ printThreadCount(type, "start groups");
+ LOG.info("start groups: " + cluster.printServers());
+
+ // randomly remove two of the groups
+ LOG.info("chosen = " + chosen + ", " + groups[chosen]);
+
+ for (int i = 0; i < groups.length; i++) {
+ if (i != chosen) {
+ final RaftGroup g = groups[i];
+ LOG.info(i + ") close " + cluster.printServers(g.getGroupId()));
+ for (RaftPeer p : g.getPeers()) {
+ final RaftServer.Division d = cluster.getDivision(p.getId(),
g.getGroupId());
+ final File root = d.getRaftStorage().getStorageDir().getRoot();
+ Assert.assertTrue(root.exists());
+ Assert.assertTrue(root.isDirectory());
+
+ final RaftClientReply r;
+ try (final RaftClient client = cluster.createClient(p.getId(), g))
{
+ r =
client.getGroupManagementApi(p.getId()).remove(g.getGroupId(), true, false);
+ }
+ Assert.assertTrue(r.isSuccess());
+ Assert.assertFalse(root.exists());
}
- Assert.assertTrue(r.isSuccess());
- Assert.assertFalse(root.exists());
}
}
- }
- printThreadCount(type, "close groups");
- LOG.info("close groups: " + cluster.printServers());
-
- // update chosen group to use all the peers
- final RaftGroup newGroup = RaftGroup.valueOf(groups[chosen].getGroupId());
- for(int i = 0; i < groups.length; i++) {
- if (i != chosen) {
- LOG.info(i + ") groupAdd: " +
cluster.printServers(groups[i].getGroupId()));
- for (RaftPeer p : groups[i].getPeers()) {
- try (final RaftClient client = cluster.createClient(p.getId(),
groups[i])) {
- client.getGroupManagementApi(p.getId()).add(newGroup);
+ printThreadCount(type, "close groups");
+ LOG.info("close groups: " + cluster.printServers());
+
+ // update chosen group to use all the peers
+ final RaftGroup newGroup =
RaftGroup.valueOf(groups[chosen].getGroupId());
+ for (int i = 0; i < groups.length; i++) {
+ if (i != chosen) {
+ LOG.info(i + ") groupAdd: " +
cluster.printServers(groups[i].getGroupId()));
+ for (RaftPeer p : groups[i].getPeers()) {
+ try (final RaftClient client = cluster.createClient(p.getId(),
groups[i])) {
+ client.getGroupManagementApi(p.getId()).add(newGroup);
+ }
}
}
}
- }
- LOG.info(chosen + ") setConfiguration: " +
cluster.printServers(groups[chosen].getGroupId()));
- try (final RaftClient client = cluster.createClient(groups[chosen])) {
- client.admin().setConfiguration(allPeers.toArray(RaftPeer.emptyArray()));
- }
-
- Assert.assertNotNull(RaftTestUtil.waitForLeader(cluster));
- checker.accept(cluster, groups[chosen]);
- LOG.info("update groups: " + cluster.printServers());
- printThreadCount(type, "update groups");
+ LOG.info(chosen + ") setConfiguration: " +
cluster.printServers(groups[chosen].getGroupId()));
+ try (final RaftClient client = cluster.createClient(groups[chosen])) {
+
client.admin().setConfiguration(allPeers.toArray(RaftPeer.emptyArray()));
+ }
- cluster.shutdown();
- printThreadCount(type, "shutdown");
+ Assert.assertNotNull(RaftTestUtil.waitForLeader(cluster));
+ checker.accept(cluster, groups[chosen]);
+ LOG.info("update groups: " + cluster.printServers());
+ printThreadCount(type, "update groups");
+ } finally {
+ cluster.shutdown();
+ printThreadCount(type, "shutdown");
+ }
}
static void printThreadCount(String type, String label) {
