set surefire jvm mem opts

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

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -4,8 +4,6 @@ on: [ push ]
 
 jobs:
   build:
-    env:
-      MAVEN_OPTS: "-Xmx12G -Xms4G"
     runs-on: ubuntu-latest
 
     steps:

diff --git a/choam/src/main/java/com/salesforce/apollo/choam/Session.java b/choam/src/main/java/com/salesforce/apollo/choam/Session.java
@@ -90,8 +90,8 @@ public static <T> CompletableFuture<T> retryNesting(Supplier<CompletableFuture<T
         CompletableFuture<T> cf = supplier.get();
         for (int i = 0; i < maxRetries; i++) {
             final var attempt = i;
-            cf = cf.thenApply(CompletableFuture::completedFuture).exceptionally(__ -> {
-                log.trace("resubmitting after attempt: {}", attempt + 1);
+            cf = cf.thenApply(CompletableFuture::completedFuture).exceptionally(e -> {
+                log.info("resubmitting after attempt: {} exception: {}", attempt + 1, e.toString());
                 return supplier.get();
             }).thenCompose(java.util.function.Function.identity());
         }

diff --git a/pom.xml b/pom.xml
@@ -784,6 +784,7 @@
                     <configuration>
                         <forkCount>${forks}</forkCount>
                         <reuseForks>true</reuseForks>
+                        <argLine>-Xmx10G -Xms4G</argLine>
                         <argLine>-Djdk.tracePinnedThreads=full</argLine>
                     </configuration>
                 </plugin>
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,8 +4,6 @@ on: [ push ] @@
     jobs:
       build:
-        env:
-          MAVEN_OPTS: "-Xmx12G -Xms4G"
         runs-on: ubuntu-latest
         steps:
@@ Expand Down @@