From b9907d18a228d06e9f2c2e342f8bb16bb4cd3d8e Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Fri, 23 Jun 2023 21:31:35 +0200 Subject: [PATCH] fix: get wait time statistics MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- .../selection-strategies/abstract-worker-choice-strategy.ts | 4 ++-- src/worker/abstract-worker.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts index b9f6e721..476c58bc 100644 --- a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts @@ -176,8 +176,8 @@ export abstract class AbstractWorkerChoiceStrategy< */ protected getWorkerTaskWaitTime (workerNodeKey: number): number { return this.taskStatisticsRequirements.waitTime.median - ? this.pool.workerNodes[workerNodeKey].workerUsage.runTime.median - : this.pool.workerNodes[workerNodeKey].workerUsage.runTime.average + ? this.pool.workerNodes[workerNodeKey].workerUsage.waitTime.median + : this.pool.workerNodes[workerNodeKey].workerUsage.waitTime.average } /** diff --git a/src/worker/abstract-worker.ts b/src/worker/abstract-worker.ts index a84bb069..b0da7b3e 100644 --- a/src/worker/abstract-worker.ts +++ b/src/worker/abstract-worker.ts @@ -160,13 +160,13 @@ export abstract class AbstractWorker< } else if (message.parent != null) { // Main worker reference message received this.mainWorker = message.parent + } else if (message.statistics != null) { + // Statistics message received + this.statistics = message.statistics } else if (message.kill != null) { // Kill message received this.aliveInterval != null && clearInterval(this.aliveInterval) this.emitDestroy() - } else if (message.statistics != null) { - // Statistics message received - this.statistics = message.statistics } } -- 2.34.1