fix: worker node destroy race condition at pool destroy

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/src/pools/abstract-pool.ts b/src/pools/abstract-pool.ts
index 1b7a9d7587256a9f1d9cb34db6ebad2e4ad47154..22da4e00b0fce07966a73d43c40ba41af4ce2700 100644 (file)
--- a/src/pools/abstract-pool.ts
+++ b/src/pools/abstract-pool.ts
@@ -1061,6 +1061,9 @@ export abstract class AbstractPool<
   protected createAndSetupDynamicWorkerNode (): number {
     const workerNodeKey = this.createAndSetupWorkerNode()
     this.registerWorkerMessageListener(workerNodeKey, message => {
+      if (this.destroying) {
+        return
+      }
       this.checkMessageWorkerId(message)
       const localWorkerNodeKey = this.getWorkerNodeKeyByWorkerId(
         message.workerId
@@ -1072,8 +1075,6 @@ export abstract class AbstractPool<
           this.isWorkerNodeIdle(localWorkerNodeKey) &&
           !this.isWorkerNodeStealing(localWorkerNodeKey))
       ) {
-        // Flag the worker node as not ready immediately
-        this.flagWorkerNodeAsNotReady(localWorkerNodeKey)
         this.destroyWorkerNode(localWorkerNodeKey).catch((error: unknown) => {
           this.emitter?.emit(PoolEvents.error, error)
         })

diff --git a/src/pools/utils.ts b/src/pools/utils.ts
index fce4550fede365a836af546c7d16677d9e5eb18b..93cb4207053aea154c7f67e4f3138bb698e82c3b 100644 (file)
--- a/src/pools/utils.ts
+++ b/src/pools/utils.ts
@@ -470,7 +470,7 @@ export const waitWorkerNodeEvents = async <
     }
     const listener = () => {
       ++events
-      if (events === numberOfEventsToWait) {
+      if (events >= numberOfEventsToWait) {
         if (timeoutHandle != null) clearTimeout(timeoutHandle)
         workerNode.off(workerNodeEvent, listener)
         resolve(events)

diff --git a/tests/test-utils.cjs b/tests/test-utils.cjs
index 62f08001959e2a7be03b73ded5d80370f2d098ee..4b73d633b5e43a73e27030bf82f2f8eb5e28c282 100644 (file)
--- a/tests/test-utils.cjs
+++ b/tests/test-utils.cjs
@@ -25,7 +25,7 @@ const waitWorkerEvents = async (
     }, timeoutMs)
     const listener = () => {
       events++
-      if (events === numberOfEventsToWait) {
+      if (events >= numberOfEventsToWait) {
         clearTimeout(timeout)
         listeners.forEach(({ listener, workerNode }) => {
           workerNode.worker.off(workerEvent, listener)