fix logging, back out some exec/sched changes in routing

salesforce · May 28, 2024 · b9388c4 · b9388c4
1 parent 45df9cf
commit b9388c4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/choam/src/main/java/com/salesforce/apollo/choam/ViewContext.java b/choam/src/main/java/com/salesforce/apollo/choam/ViewContext.java
@@ -244,16 +244,16 @@ public boolean validate(SignedViews sv) {
         Verifier v = verifierOf(sv);
         if (v == null) {
             if (log.isDebugEnabled()) {
-                log.warn("No verifier: {} for signed view on: {}", Digest.from(sv.getViews().getMember()),
-                         params.member().getId());
+                log.debug("No verifier: {} for signed view on: {}", Digest.from(sv.getViews().getMember()),
+                          params.member().getId());
             }
             return false;
         }
         var validated = v.verify(JohnHancock.from(sv.getSignature()), sv.getViews().toByteString());
         if (!validated) {
             if (log.isTraceEnabled()) {
-                log.warn("Cannot validate views signed by: {} on: {}", Digest.from(sv.getViews().getMember()),
-                         params().member().getId());
+                log.trace("Cannot validate views signed by: {} on: {}", Digest.from(sv.getViews().getMember()),
+                          params().member().getId());
             }
         } else if (log.isTraceEnabled()) {
             log.trace("Validated views signed by: {} on: {}", Digest.from(sv.getViews().getMember()),

diff --git a/memberships/src/main/java/com/salesforce/apollo/archipelago/LocalServer.java b/memberships/src/main/java/com/salesforce/apollo/archipelago/LocalServer.java
@@ -79,9 +79,6 @@ public RouterImpl router(ServerConnectionCache.Builder cacheBuilder, Supplier<Li
         }
         ServerBuilder<?> serverBuilder = InProcessServerBuilder.forName(name)
                                                                .executor(Executors.newVirtualThreadPerTaskExecutor())
-                                                               .scheduledExecutorService(
-                                                               Executors.newScheduledThreadPool(100, Thread.ofVirtual()
-                                                                                                           .factory()))
                                                                .intercept(ConcurrencyLimitServerInterceptor.newBuilder(
                                                                                                            limitsBuilder.build())
                                                                                                            .statusSupplier(
@@ -105,7 +102,6 @@ private ManagedChannel connectTo(Member to) {
         final var name = String.format(NAME_TEMPLATE, prefix, qb64(to.getId()));
         final InProcessChannelBuilder builder = InProcessChannelBuilder.forName(name)
                                                                        .executor(executor)
-                                                                       .offloadExecutor(executor)
                                                                        .usePlaintext()
                                                                        .intercept(clientInterceptor);
         disableTrash(builder);

diff --git a/memberships/src/main/java/com/salesforce/apollo/archipelago/MtlsClient.java b/memberships/src/main/java/com/salesforce/apollo/archipelago/MtlsClient.java
@@ -34,7 +34,6 @@ public MtlsClient(SocketAddress address, ClientAuth clientAuth, String alias, Cl
         Limiter<GrpcClientRequestContext> limiter = new GrpcClientLimiterBuilder().blockOnLimit(false).build();
         channel = NettyChannelBuilder.forAddress(address)
                                      .executor(executor)
-                                     .offloadExecutor(executor)
                                      .withOption(ChannelOption.TCP_NODELAY, true)
                                      .sslContext(supplier.forClient(clientAuth, alias, validator, MtlsServer.TL_SV1_3))
                                      .intercept(new ConcurrencyLimitClientInterceptor(limiter,

diff --git a/pom.xml b/pom.xml
@@ -780,7 +780,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.1.2</version>
+                    <version>3.2.5</version>
                     <configuration>
                         <forkCount>${forks}</forkCount>
                         <reuseForks>true</reuseForks>