From 613a91dc3e9745e9f4ae53f589fe0ee6d2b594cd Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= <jerome.benoit@piment-noir.org>
Date: Tue, 19 Dec 2023 14:09:50 +0100
Subject: [PATCH] fix: wait for worker node readiness
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

closes #1748

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>
---
 .../worker-choice-strategy-context.ts         | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/pools/selection-strategies/worker-choice-strategy-context.ts b/src/pools/selection-strategies/worker-choice-strategy-context.ts
index 157a6122..d6a6e26d 100644
--- a/src/pools/selection-strategies/worker-choice-strategy-context.ts
+++ b/src/pools/selection-strategies/worker-choice-strategy-context.ts
@@ -164,36 +164,38 @@ export class WorkerChoiceStrategyContext<
    *
    * @returns The key of the worker node.
    * @throws {@link https://nodejs.org/api/errors.html#class-error} If after configured retries the worker node key is null or undefined.
-   * @throws {@link https://nodejs.org/api/errors.html#class-rangeerror} If the maximum consecutive worker choice strategy executions has been reached.
    */
   public execute (): number {
     const workerChoiceStrategy = this.workerChoiceStrategies.get(
       this.workerChoiceStrategy
     ) as IWorkerChoiceStrategy
+    if (!workerChoiceStrategy.hasPoolWorkerNodesReady()) {
+      // wait for a worker node to be ready without blocking the event loop
+    }
+    return this.executeStrategy(workerChoiceStrategy)
+  }
+
+  /**
+   * Executes the given worker choice strategy.
+   *
+   * @param workerChoiceStrategy - The worker choice strategy.
+   * @returns The key of the worker node.
+   * @throws {@link https://nodejs.org/api/errors.html#class-error} If after configured retries the worker node key is null or undefined.
+   */
+  private executeStrategy (workerChoiceStrategy: IWorkerChoiceStrategy): number {
     let workerNodeKey: number | undefined
-    const maxExecutionCount = 10000
-    let executionCount = 0
     let chooseCount = 0
     let retriesCount = 0
     do {
-      if (workerChoiceStrategy.hasPoolWorkerNodesReady()) {
-        workerNodeKey = workerChoiceStrategy.choose()
-        if (chooseCount > 0) {
-          retriesCount++
-        }
-        chooseCount++
+      workerNodeKey = workerChoiceStrategy.choose()
+      if (workerNodeKey == null && chooseCount > 0) {
+        retriesCount++
       }
-      executionCount++
+      chooseCount++
     } while (
-      executionCount < maxExecutionCount &&
-      (!workerChoiceStrategy.hasPoolWorkerNodesReady() ||
-        (workerNodeKey == null && retriesCount < (this.opts.retries as number)))
+      workerNodeKey == null &&
+      retriesCount < (this.opts.retries as number)
     )
-    if (executionCount >= maxExecutionCount) {
-      throw new RangeError(
-        `Worker choice strategy consecutive executions has exceeded the maximum of ${maxExecutionCount}`
-      )
-    }
     if (workerNodeKey == null) {
       throw new Error(
         `Worker node key chosen is null or undefined after ${retriesCount} retries`
-- 
2.34.1