Ensure random member selectors select from full set of members.

atomix · Jan 21, 2015 · 8bcd211 · 8bcd211
1 parent 0f565e4
commit 8bcd211
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/collections/src/test/java/net/kuujo/copycat/collections/AsyncMapTest.java b/collections/src/test/java/net/kuujo/copycat/collections/AsyncMapTest.java
@@ -33,7 +33,7 @@ public class AsyncMapTest extends ConcurrentTestCase {
   public void testAsyncMapPutGet() throws Throwable {
     TestCluster<AsyncMap<String, String>> cluster = TestCluster.of((uri, config) -> AsyncMap.create("test", uri, config, new AsyncMapConfig().withLog(new BufferedLog())));
     cluster.open().thenRun(this::resume);
-    await(5000);
+    await(15000);
     AsyncMap<String, String> map = cluster.activeResources().iterator().next();
     map.put("foo", "Hello world!").thenRun(() -> {
       map.get("foo").thenAccept(result -> {

diff --git a/core/src/main/java/net/kuujo/copycat/internal/PassiveState.java b/core/src/main/java/net/kuujo/copycat/internal/PassiveState.java
@@ -98,7 +98,7 @@ private void sync() {
     Random random = new Random();
     List<ReplicaInfo> randomMembers = new ArrayList<>(3);
     for (int i = 0; i < Math.min(activeMembers.size(), 3); i++) {
-      randomMembers.add(activeMembers.get(random.nextInt(Math.min(activeMembers.size(), 2))));
+      randomMembers.add(activeMembers.get(random.nextInt(Math.min(activeMembers.size(), 3))));
     }
 
     // Increment the local member version in the vector clock.

diff --git a/core/src/main/java/net/kuujo/copycat/internal/cluster/AbstractCluster.java b/core/src/main/java/net/kuujo/copycat/internal/cluster/AbstractCluster.java
@@ -243,7 +243,7 @@ private Collection<CoordinatedMember> getGossipMembers() {
       // Create a random list of three active members.
       Collection<CoordinatedMember> randomMembers = new HashSet<>(3);
       for (int i = 0; i < Math.min(activeMembers.size(), 3); i++) {
-        randomMembers.add(activeMembers.get(random.nextInt(Math.min(activeMembers.size(), 2))));
+        randomMembers.add(activeMembers.get(random.nextInt(Math.min(activeMembers.size(), 3))));
       }
       return randomMembers;
     }