nu (#155)

* don't force update snapshots * proactive transaction cancellation instead of timeouts
salesforce · Nov 11, 2023 · 2ac0354 · 2ac0354
1 parent f4e8420
commit 2ac0354
Show file tree

Hide file tree

Showing 18 changed files with 689 additions and 584 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -20,4 +20,4 @@ jobs:
           cache: 'maven'
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Build with Maven
-        run: mvn -batch-mode --update-snapshots clean install -Ppre --file pom.xml
+        run: mvn -batch-mode clean install -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
@@ -33,6 +33,7 @@
 import com.salesforce.apollo.membership.messaging.rbc.ReliableBroadcaster.MessageAdapter;
 import com.salesforce.apollo.membership.messaging.rbc.ReliableBroadcaster.Msg;
 import com.salesforce.apollo.utils.RoundScheduler;
+import com.salesforce.apollo.utils.Utils;
 import com.salesforce.apollo.utils.bloomFilters.BloomFilter;
 import io.grpc.StatusRuntimeException;
 import org.h2.mvstore.MVMap;
@@ -107,7 +108,7 @@ public CHOAM(Parameters params) {
         Thread.ofVirtual().name("Linear " + params.member().getId()).factory());
         combine.registerHandler((ctx, messages) -> {
             try {
-                linear.execute(() -> combine(messages));
+                linear.execute(Utils.wrapped(() -> combine(messages), log));
             } catch (RejectedExecutionException e) {
                 // ignore
             }
@@ -683,6 +684,7 @@ private void reconfigure(Reconfigure reconfigure) {
         } else {
             current.set(new Client(validators, getViewId()));
         }
+        session.setView(h);
         log.info("Reconfigured to view: {} validators: {} on: {}", new Digest(reconfigure.getId()),
                  validators.entrySet()
                            .stream()

diff --git a/choam/src/main/java/com/salesforce/apollo/choam/Parameters.java b/choam/src/main/java/com/salesforce/apollo/choam/Parameters.java
@@ -556,11 +556,11 @@ public Builder setMaxGossipDelay(Duration maxGossipDelay) {
     public static class LimiterBuilder {
         private Duration backlogDuration = Duration.ofSeconds(1);
         private int      backlogSize     = 1_000;
-        private double   backoffRatio    = 0.9;
+        private double   backoffRatio    = 0.5;
         private int      initialLimit    = 1_000;
-        private int      maxLimit        = 5_000;
-        private int      minLimit        = 1_000;
-        private Duration timeout         = Duration.ofMillis(100);
+        private int      maxLimit        = 10_000;
+        private int      minLimit        = 1_00;
+        private Duration timeout         = Duration.ofSeconds(1);
 
         public Limiter<Void> build(String name, MetricRegistry metrics) {
             final SimpleLimiter<Void> limiter = SimpleLimiter.newBuilder()
@@ -668,12 +668,11 @@ public static class Builder implements Cloneable {
         private int                              regenerationCycles    = 20;
         private ExponentialBackoffPolicy.Builder submitPolicy          = ExponentialBackoffPolicy.newBuilder()
                                                                                                  .setInitialBackoff(
-                                                                                                 Duration.ofMillis(10))
+                                                                                                 Duration.ofMillis(500))
                                                                                                  .setJitter(0.2)
                                                                                                  .setMultiplier(1.6)
                                                                                                  .setMaxBackoff(
-                                                                                                 Duration.ofMillis(
-                                                                                                 500));
+                                                                                                 Duration.ofSeconds(5));
         private Duration                         submitTimeout         = Duration.ofSeconds(30);
         private int                              synchronizationCycles = 10;
         private LimiterBuilder                   txnLimiterBuilder     = new LimiterBuilder();