yet again

salesforce · Jun 6, 2024 · 23cf7ae · 23cf7ae
1 parent 1317613
commit 23cf7ae
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/fireflies/src/test/java/com/salesforce/apollo/fireflies/MtlsTest.java b/fireflies/src/test/java/com/salesforce/apollo/fireflies/MtlsTest.java
@@ -118,7 +118,6 @@ public void smoke() throws Exception {
         var frist = new AtomicBoolean(true);
 
         var clientContextSupplier = clientContextSupplier();
-        var executor = UnsafeExecutors.newVirtualThreadPerTaskExecutor();
         views = members.stream().map(node -> {
             DynamicContext<Participant> context = ctxBuilder.build();
             FireflyMetricsImpl metrics = new FireflyMetricsImpl(context.getId(),
@@ -128,7 +127,7 @@ public void smoke() throws Exception {
             builder.setMetrics(new ServerConnectionCacheMetricsImpl(frist.getAndSet(false) ? node0Registry : registry));
             CertificateWithPrivateKey certWithKey = certs.get(node.getId());
             Router comms = new MtlsServer(node, ep, clientContextSupplier, serverContextSupplier(certWithKey)).router(
-            builder, executor);
+            builder);
             communications.add(comms);
             return new View(context, node, endpoints.get(node.getId()), EventValidation.NONE, Verifiers.NONE, comms,
                             parameters, DigestAlgorithm.DEFAULT, metrics);

diff --git a/model/src/test/java/com/salesforce/apollo/model/ContainmentDomainTest.java b/model/src/test/java/com/salesforce/apollo/model/ContainmentDomainTest.java
@@ -6,7 +6,10 @@
  */
 package com.salesforce.apollo.model;
 
-import com.salesforce.apollo.archipelago.*;
+import com.salesforce.apollo.archipelago.EndpointProvider;
+import com.salesforce.apollo.archipelago.LocalServer;
+import com.salesforce.apollo.archipelago.Router;
+import com.salesforce.apollo.archipelago.ServerConnectionCache;
 import com.salesforce.apollo.choam.Parameters;
 import com.salesforce.apollo.choam.Parameters.Builder;
 import com.salesforce.apollo.choam.Parameters.RuntimeParameters;
@@ -79,11 +82,9 @@ public void before() throws Exception {
 
         var sealed = FoundationSeal.newBuilder().build();
         final var group = DigestAlgorithm.DEFAULT.getOrigin();
-        var executor = UnsafeExecutors.newVirtualThreadPerTaskExecutor();
         identities.forEach((d, id) -> {
             final var member = new ControlledIdentifierMember(id);
-            var localRouter = new LocalServer(prefix, member).router(ServerConnectionCache.newBuilder().setTarget(30),
-                                                                     executor);
+            var localRouter = new LocalServer(prefix, member).router(ServerConnectionCache.newBuilder().setTarget(30));
             routers.add(localRouter);
             var dbUrl = String.format("jdbc:h2:mem:sql-%s-%s;DB_CLOSE_DELAY=-1", member.getId(), UUID.randomUUID());
             var pdParams = new ProcessDomain.ProcessDomainParameters(dbUrl, Duration.ofMinutes(1),

diff --git a/pom.xml b/pom.xml
@@ -783,9 +783,7 @@
                     <version>3.2.5</version>
                     <configuration>
                         <forkCount>${forks}</forkCount>
-                        <reuseForks>false</reuseForks>
-                        <argLine>-Xmx10G -Xms4G</argLine>
-                        <argLine>-Djdk.tracePinnedThreads=full</argLine>
+                        <reuseForks>true</reuseForks>
                     </configuration>
                 </plugin>
                 <plugin>