repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: fix race condition in worker choice strategies
[poolifier.git]
/
src
/
pools
/
selection-strategies
/
least-used-worker-choice-strategy.ts
diff --git
a/src/pools/selection-strategies/least-used-worker-choice-strategy.ts
b/src/pools/selection-strategies/least-used-worker-choice-strategy.ts
index 1f7033214d6a4735c3064df290acc2ce48cb3e72..c750c290d1d7f3c5039698a9be04a2971b623781 100644
(file)
--- a/
src/pools/selection-strategies/least-used-worker-choice-strategy.ts
+++ b/
src/pools/selection-strategies/least-used-worker-choice-strategy.ts
@@
-4,7
+4,6
@@
import type { IWorker } from '../worker'
import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
import type {
IWorkerChoiceStrategy,
import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
import type {
IWorkerChoiceStrategy,
- StrategyPolicy,
WorkerChoiceStrategyOptions
} from './selection-strategies-types'
WorkerChoiceStrategyOptions
} from './selection-strategies-types'
@@
-22,12
+21,6
@@
export class LeastUsedWorkerChoiceStrategy<
>
extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
implements IWorkerChoiceStrategy {
>
extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
implements IWorkerChoiceStrategy {
- /** @inheritDoc */
- public readonly strategyPolicy: StrategyPolicy = {
- dynamicWorkerUsage: false,
- dynamicWorkerReady: true
- }
-
/** @inheritDoc */
public constructor (
pool: IPool<Worker, Data, Response>,
/** @inheritDoc */
public constructor (
pool: IPool<Worker, Data, Response>,
@@
-49,8
+42,7
@@
export class LeastUsedWorkerChoiceStrategy<
/** @inheritDoc */
public choose (): number | undefined {
/** @inheritDoc */
public choose (): number | undefined {
- const chosenWorkerNodeKey = this.leastUsedNextWorkerNodeKey()
- this.assignChosenWorkerNodeKey(chosenWorkerNodeKey)
+ this.nextWorkerNodeKey = this.leastUsedNextWorkerNodeKey()
return this.nextWorkerNodeKey
}
return this.nextWorkerNodeKey
}
@@
-68,13
+60,10
@@
export class LeastUsedWorkerChoiceStrategy<
workerTaskStatistics.executed +
workerTaskStatistics.executing +
workerTaskStatistics.queued
workerTaskStatistics.executed +
workerTaskStatistics.executing +
workerTaskStatistics.queued
- if (
this.isWorkerNodeEligible(workerNodeKey) &&
workerTasks === 0) {
+ if (workerTasks === 0) {
chosenWorkerNodeKey = workerNodeKey
break
chosenWorkerNodeKey = workerNodeKey
break
- } else if (
- this.isWorkerNodeEligible(workerNodeKey) &&
- workerTasks < minNumberOfTasks
- ) {
+ } else if (workerTasks < minNumberOfTasks) {
minNumberOfTasks = workerTasks
chosenWorkerNodeKey = workerNodeKey
}
minNumberOfTasks = workerTasks
chosenWorkerNodeKey = workerNodeKey
}