experimental: adjust timeout for fewer than 8 available processors

Signed-off-by: Michael Edgar <medgar@redhat.com>
MikeEdgar · Jan 8, 2024 · 36ae567 · 36ae567
1 parent 284547c
commit 36ae567
Showing 1 changed file with 30 additions and 1 deletion.
diff --git a/test/src/main/java/io/strimzi/test/TestUtils.java b/test/src/main/java/io/strimzi/test/TestUtils.java
@@ -104,6 +104,28 @@ public final class TestUtils {
      */
     public static final TimeUnit DEFAULT_TIMEOUT_UNIT = TimeUnit.SECONDS;
 
+    /**
+     * Number of available processors (as given by {@link Runtime#availableProcessors()}) with
+     * which the literal timeout values in test cases are expected to be sufficient. When running
+     * on a system with fewer CPUs than this number, the timeout values will be increased by a
+     * factor calculated by dividing the target CPU count by the actual count.
+     */
+    private static final int TARGET_CPU_COUNT = Optional.ofNullable(System.getenv("STRIMZI_TEST_TARGET_CPU_COUNT"))
+            .map(Integer::parseInt)
+            .orElse(8);
+    private static final float CPU_ADJUSTMENT;
+
+    static {
+        int cpuCount = Runtime.getRuntime().availableProcessors();
+
+        if (cpuCount < TARGET_CPU_COUNT) {
+            CPU_ADJUSTMENT = ((float) TARGET_CPU_COUNT) / cpuCount;
+            LOGGER.info("TestUtils#waitFor timeouts will be adjusted by {} for {} CPUs (less than target {})", CPU_ADJUSTMENT, cpuCount, TARGET_CPU_COUNT);
+        } else {
+            CPU_ADJUSTMENT = 1f;
+        }
+    }
+
     private TestUtils() {
         // All static methods
     }
@@ -133,7 +155,14 @@ public static long waitFor(String description, long pollIntervalMs, long timeout
 
     public static long waitFor(String description, long pollIntervalMs, long timeoutMs, BooleanSupplier ready, Runnable onTimeout) {
         LOGGER.debug("Waiting for {}", description);
-        long deadline = System.currentTimeMillis() + timeoutMs;
+        long deadline;
+
+        if (CPU_ADJUSTMENT > 1f) {
+            long adjustedTimeoutMs = (long) (timeoutMs * CPU_ADJUSTMENT);
+            deadline = System.currentTimeMillis() + adjustedTimeoutMs;
+        } else {
+            deadline = System.currentTimeMillis() + timeoutMs;
+        }
 
         String exceptionMessage = null;
         String previousExceptionMessage = null;