Test with two threads at least #128

apache · Oct 23, 2020 · 9c4bab0 · 9c4bab0
1 parent a11b4c4
commit 9c4bab0
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 8 deletions.
diff --git a/client/src/main/java/org/jboss/fuse/mvnd/client/ClientLayout.java b/client/src/main/java/org/jboss/fuse/mvnd/client/ClientLayout.java
@@ -41,6 +41,7 @@ public class ClientLayout extends Layout {
     private final int idleTimeoutMs;
     private final int keepAliveMs;
     private final int maxLostKeepAlive;
+    private final int minThreads;
 
     public static ClientLayout getEnvInstance() {
         if (ENV_INSTANCE == null) {
@@ -86,6 +87,11 @@ public static ClientLayout getEnvInstance() {
                     .orLocalProperty(mvndProperties, mvndPropertiesPath)
                     .orDefault(() -> Integer.toString(Environment.DEFAULT_MAX_LOST_KEEP_ALIVE))
                     .asInt();
+            final int minThreads = Environment.MVND_MIN_THREADS
+                    .systemProperty()
+                    .orLocalProperty(mvndProperties, mvndPropertiesPath)
+                    .orDefault(() -> Integer.toString(Environment.DEFAULT_MIN_THREADS))
+                    .asInt();
             ENV_INSTANCE = new ClientLayout(
                     mvndPropertiesPath,
                     mvndHome,
@@ -95,14 +101,14 @@ public static ClientLayout getEnvInstance() {
                     findLocalRepo(),
                     null,
                     Environment.findLogbackConfigurationPath(mvndProperties, mvndPropertiesPath, mvndHome),
-                    idleTimeoutMs, keepAliveMs, maxLostKeepAlive);
+                    idleTimeoutMs, keepAliveMs, maxLostKeepAlive, minThreads);
         }
         return ENV_INSTANCE;
     }
 
     public ClientLayout(Path mvndPropertiesPath, Path mavenHome, Path userDir, Path multiModuleProjectDirectory, Path javaHome,
             Path localMavenRepository, Path settings, Path logbackConfigurationPath, int idleTimeoutMs, int keepAliveMs,
-            int maxLostKeepAlive) {
+            int maxLostKeepAlive, int minThreads) {
         super(mvndPropertiesPath, mavenHome, userDir, multiModuleProjectDirectory);
         this.localMavenRepository = localMavenRepository;
         this.settings = settings;
@@ -111,6 +117,7 @@ public ClientLayout(Path mvndPropertiesPath, Path mavenHome, Path userDir, Path
         this.idleTimeoutMs = idleTimeoutMs;
         this.keepAliveMs = keepAliveMs;
         this.maxLostKeepAlive = maxLostKeepAlive;
+        this.minThreads = minThreads;
     }
 
     /**
@@ -119,7 +126,8 @@ public ClientLayout(Path mvndPropertiesPath, Path mavenHome, Path userDir, Path
      */
     public ClientLayout cd(Path newUserDir) {
         return new ClientLayout(mvndPropertiesPath, mavenHome, newUserDir, multiModuleProjectDirectory, javaHome,
-                localMavenRepository, settings, logbackConfigurationPath, idleTimeoutMs, keepAliveMs, maxLostKeepAlive);
+                localMavenRepository, settings, logbackConfigurationPath, idleTimeoutMs, keepAliveMs, maxLostKeepAlive,
+                minThreads);
     }
 
     /**
@@ -157,6 +165,14 @@ public int getMaxLostKeepAlive() {
         return maxLostKeepAlive;
     }
 
+    /**
+     * @return the minimum number of threads to use when constructing the default {@code -T} parameter for the daemon.
+     *         This value is ignored if the user passes his own `-T` or `--threads`.
+     */
+    public int getMinThreads() {
+        return minThreads;
+    }
+
     static Path findLocalRepo() {
         return Environment.MAVEN_REPO_LOCAL.systemProperty().asPath();
     }

diff --git a/client/src/main/java/org/jboss/fuse/mvnd/client/DefaultClient.java b/client/src/main/java/org/jboss/fuse/mvnd/client/DefaultClient.java
@@ -169,7 +169,7 @@ public ExecutionResult execute(ClientOutput output, List<String> argv) {
                 return new DefaultResult(argv, null);
             }
 
-            setDefaultArgs(args);
+            setDefaultArgs(args, layout);
             final Path settings = layout.getSettings();
             if (settings != null && args.stream().noneMatch(arg -> arg.equals("-s") || arg.equals("--settings"))) {
                 args.add("-s");
@@ -237,10 +237,10 @@ public ExecutionResult execute(ClientOutput output, List<String> argv) {
 
     }
 
-    static void setDefaultArgs(List<String> args) {
+    static void setDefaultArgs(List<String> args, ClientLayout layout) {
         if (args.stream().noneMatch(arg -> arg.startsWith("-T") || arg.equals("--threads"))) {
-            final int procs = Math.max(Runtime.getRuntime().availableProcessors() - 1, 1);
-            args.add("-T" + procs);
+            final int threads = Math.max(Runtime.getRuntime().availableProcessors() - 1, layout.getMinThreads());
+            args.add("-T" + threads);
         }
         if (args.stream().noneMatch(arg -> arg.startsWith("-b") || arg.equals("--builder"))) {
             args.add("-bsmart");

diff --git a/common/src/main/java/org/jboss/fuse/mvnd/common/Environment.java b/common/src/main/java/org/jboss/fuse/mvnd/common/Environment.java
@@ -43,6 +43,7 @@ public enum Environment {
     DAEMON_IDLE_TIMEOUT_MS("daemon.idleTimeoutMs", null),
     DAEMON_KEEP_ALIVE_MS("daemon.keepAliveMs", null),
     DAEMON_MAX_LOST_KEEP_ALIVE("daemon.maxLostKeepAlive", null),
+    MVND_MIN_THREADS("mvnd.minThreads", null),
     DAEMON_UID("daemon.uid", null);
 
     public static final int DEFAULT_IDLE_TIMEOUT = (int) TimeUnit.HOURS.toMillis(3);
@@ -51,6 +52,8 @@ public enum Environment {
 
     public static final int DEFAULT_MAX_LOST_KEEP_ALIVE = 3;
 
+    public static final int DEFAULT_MIN_THREADS = 1;
+
     private static final Logger LOG = LoggerFactory.getLogger(Environment.class);
     static Properties properties = System.getProperties();
     static Map<String, String> env = System.getenv();

diff --git a/integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/NativeTestClient.java b/integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/NativeTestClient.java
@@ -68,6 +68,10 @@ public ExecutionResult execute(ClientOutput output, List<String> args) throws In
             cmd.add("-s");
             cmd.add(settings.toString());
         }
+        if (args.stream().noneMatch(arg -> arg.startsWith("-T") || arg.equals("--threads"))) {
+            final int threads = Math.max(Runtime.getRuntime().availableProcessors() - 1, TestLayout.TEST_MIN_THREADS);
+            cmd.add("-T" + threads);
+        }
 
         final ProcessBuilder builder = new ProcessBuilder(cmd.toArray(new String[0]))
                 .directory(layout.userDir().toFile()) //

diff --git a/integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/TestLayout.java b/integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/TestLayout.java
@@ -19,13 +19,14 @@
 import org.jboss.fuse.mvnd.client.ClientLayout;
 
 public class TestLayout extends ClientLayout {
+    static final int TEST_MIN_THREADS = 2;
     private final Path testDir;
 
     public TestLayout(Path testDir, Path mvndPropertiesPath, Path mavenHome, Path userDir, Path multiModuleProjectDirectory,
             Path javaHome, Path localMavenRepository, Path settings, Path logbackConfigurationPath,
             int idleTimeout, int keepAlive, int maxLostKeepAlive) {
         super(mvndPropertiesPath, mavenHome, userDir, multiModuleProjectDirectory, javaHome, localMavenRepository,
-                settings, logbackConfigurationPath, idleTimeout, keepAlive, maxLostKeepAlive);
+                settings, logbackConfigurationPath, idleTimeout, keepAlive, maxLostKeepAlive, TEST_MIN_THREADS);
         this.testDir = testDir;
     }