misc-3 (#200)

* misc clean up * parameterize aux population update duration. use different mechanism to determine if redirect * allow dups in view gossip * revert back to trace * back off on durations * back to single threaded tests * extend * arg * handle bootstrapping context
salesforce · May 24, 2024 · ccdf34d · ccdf34d
1 parent 781f564
commit ccdf34d
Show file tree

Hide file tree

Showing 18 changed files with 239 additions and 151 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -16,4 +16,4 @@ jobs:
           cache: 'maven'
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Build with Maven
-        run: ./mvnw -batch-mode clean install -Dforks=4 -Ppre --file pom.xml
+        run: ./mvnw -batch-mode clean install -Dforks=1 -Ppre --file pom.xml
diff --git a/choam/src/main/java/com/salesforce/apollo/choam/CHOAM.java b/choam/src/main/java/com/salesforce/apollo/choam/CHOAM.java
@@ -7,7 +7,6 @@
 package com.salesforce.apollo.choam;
 
 import com.chiralbehaviors.tron.Fsm;
-import com.google.common.base.Function;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.Empty;
 import com.google.protobuf.InvalidProtocolBufferException;
@@ -56,6 +55,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
@@ -109,10 +109,9 @@ public CHOAM(Parameters params) {
 
         rotateViewKeys();
         var bContext = new DelegatedContext<>(params.context());
-        var adapter = new MessageAdapter(_ -> true, (Function<ByteString, Digest>) this::signatureHash,
-                                         (Function<ByteString, List<Digest>>) _ -> Collections.emptyList(),
-                                         (_, any) -> any,
-                                         (Function<AgedMessageOrBuilder, ByteString>) AgedMessageOrBuilder::getContent);
+        var adapter = new MessageAdapter(_ -> true, this::signatureHash,
+                                         _ -> Collections.emptyList(),
+                                         (_, any) -> any, AgedMessageOrBuilder::getContent);
 
         combine = new ReliableBroadcaster(bContext, params.member(), params.combine(), params.communications(),
                                           params.metrics() == null ? null : params.metrics().getCombineMetrics(),
@@ -234,7 +233,9 @@ public static Block reconfigure(Digest nextViewId, Map<Digest, Join> joins, Hash
     }
 
     public static Map<Digest, Member> rosterMap(Context<Member> baseContext, Collection<Digest> members) {
-        return members.stream().collect(Collectors.toMap(m -> m, baseContext::getMember));
+        return members.stream()
+                      .map(baseContext::getMember)
+                      .collect(Collectors.toMap(Member::getId, Function.identity()));
     }
 
     public static List<Transaction> toGenesisData(List<? extends Message> initializationData) {

diff --git a/choam/src/main/java/com/salesforce/apollo/choam/Session.java b/choam/src/main/java/com/salesforce/apollo/choam/Session.java
@@ -7,7 +7,6 @@
 package com.salesforce.apollo.choam;
 
 import com.codahale.metrics.Timer;
-import com.google.common.base.Function;
 import com.google.protobuf.Message;
 import com.netflix.concurrency.limits.Limiter;
 import com.netflix.concurrency.limits.internal.EmptyMetricRegistry;
@@ -33,6 +32,7 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
 import java.util.function.Supplier;
 
 /**

diff --git a/choam/src/test/java/com/salesforce/apollo/choam/DynamicTest.java b/choam/src/test/java/com/salesforce/apollo/choam/DynamicTest.java
@@ -103,7 +103,14 @@ public void setUp() throws Exception {
 
     @Test
     public void smokin() throws Exception {
+
         var bootstrap = members.subList(0, 4);
+        var kernel = bootstrap.get(0);
+        contexts.get(kernel).activate(kernel);
+        routers.get(kernel).start();
+        choams.get(kernel).start();
+
+        bootstrap.forEach(member -> bootstrap.forEach(m -> contexts.get(member).activate(m)));
 
         bootstrap.forEach(member -> bootstrap.forEach(m -> contexts.get(member).activate(m)));
 

diff --git a/choam/src/test/java/com/salesforce/apollo/choam/TestCHOAM.java b/choam/src/test/java/com/salesforce/apollo/choam/TestCHOAM.java
@@ -102,11 +102,11 @@ public void before() throws Exception {
         var params = Parameters.newBuilder()
                                .setGenerateGenesis(true)
                                .setGenesisViewId(origin.prefix(entropy.nextLong()))
-                               .setGossipDuration(Duration.ofMillis(20))
+                               .setGossipDuration(Duration.ofMillis(30))
                                .setProducer(ProducerParameters.newBuilder()
                                                               .setMaxBatchCount(15_000)
                                                               .setMaxBatchByteSize(200 * 1024 * 1024)
-                                                              .setGossipDuration(Duration.ofMillis(10))
+                                                              .setGossipDuration(Duration.ofMillis(30))
                                                               .setBatchInterval(Duration.ofMillis(50))
                                                               .setEthereal(Config.newBuilder()
                                                                                  .setNumberOfEpochs(3)
@@ -191,7 +191,7 @@ public void submitMultiplTxn() throws Exception {
 
         transactioneers.stream().forEach(e -> e.start());
         try {
-            final var complete = countdown.await(LARGE_TESTS ? 3200 : 60, TimeUnit.SECONDS);
+            final var complete = countdown.await(LARGE_TESTS ? 3200 : 120, TimeUnit.SECONDS);
             assertTrue(complete, "All clients did not complete: " + transactioneers.stream()
                                                                                    .map(t -> t.getCompleted())
                                                                                    .filter(i -> i < max)