no reuse of forks. handle new epochs after produce.

salesforce · Mar 10, 2024 · 32df710 · 32df710
1 parent e67ec1c
commit 32df710
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/choam/src/main/java/com/salesforce/apollo/choam/fsm/Genesis.java b/choam/src/main/java/com/salesforce/apollo/choam/fsm/Genesis.java
@@ -82,6 +82,11 @@ public Transitions process(List<ByteString> preblock, boolean last) {
             public void publish() {
                 context().publish();
             }
+
+            @Override
+            public Transitions nextEpoch(Integer epoch) {
+                return null;
+            }
         }
 
     }

diff --git a/...erships/src/test/java/com/salesforce/apollo/archipelago/server/ServerInterceptorTest.java b/...erships/src/test/java/com/salesforce/apollo/archipelago/server/ServerInterceptorTest.java
@@ -68,6 +68,7 @@ public void closesCallOnInvalidToken() {
         Metadata metadata = new Metadata();
         metadata.put(Constants.AuthorizationMetadataKey, "Bearer Invalid Token");
         target.interceptCall(serverCall, metadata, next);
+        System.out.println("\n\n*** Exception above expected ***\n");
         verify(serverCall).close(any(), any());
         verify(next, never()).startCall(any(), any());
     }

diff --git a/pom.xml b/pom.xml
@@ -41,8 +41,8 @@
         <jooq.version>3.17.2</jooq.version>
         <bc.version>1.74</bc.version>
         <logback.version>1.4.12</logback.version>
-        <grpc.version>1.61.0</grpc.version>
-        <protobuf.version>3.25.2</protobuf.version>
+        <grpc.version>1.62.2</grpc.version>
+        <protobuf.version>3.25.3</protobuf.version>
         <liquibase.version>4.8.0</liquibase.version>
         <netty.version>4.1.100.Final</netty.version>
         <native.maven.plugin.version>0.9.27</native.maven.plugin.version>
@@ -779,7 +779,7 @@
                     <version>3.1.2</version>
                     <configuration>
                         <forkCount>${forks}</forkCount>
-                        <reuseForks>true</reuseForks>
+                        <reuseForks>false</reuseForks>
                     </configuration>
                 </plugin>
                 <plugin>