repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
feat: add support for tasks ELU in fair share strategy
[poolifier.git]
/
src
/
pools
/
selection-strategies
/
least-busy-worker-choice-strategy.ts
diff --git
a/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts
b/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts
index f171ab5f50b1a90d7ed48550f96dbb4d42b5e015..58fbb51ecfd5012db79b6bc3cad5a714ba93d733 100644
(file)
--- a/
src/pools/selection-strategies/least-busy-worker-choice-strategy.ts
+++ b/
src/pools/selection-strategies/least-busy-worker-choice-strategy.ts
@@
-24,13
+24,21
@@
export class LeastBusyWorkerChoiceStrategy<
implements IWorkerChoiceStrategy {
/** @inheritDoc */
public readonly taskStatisticsRequirements: TaskStatisticsRequirements = {
implements IWorkerChoiceStrategy {
/** @inheritDoc */
public readonly taskStatisticsRequirements: TaskStatisticsRequirements = {
- runTime: true,
- avgRunTime: false,
- medRunTime: false,
- waitTime: false,
- avgWaitTime: false,
- medWaitTime: false,
- elu: false
+ runTime: {
+ aggregate: true,
+ average: false,
+ median: false
+ },
+ waitTime: {
+ aggregate: true,
+ average: false,
+ median: false
+ },
+ elu: {
+ aggregate: false,
+ average: false,
+ median: false
+ }
}
/** @inheritDoc */
}
/** @inheritDoc */
@@
-39,7
+47,7
@@
export class LeastBusyWorkerChoiceStrategy<
opts: WorkerChoiceStrategyOptions = DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS
) {
super(pool, opts)
opts: WorkerChoiceStrategyOptions = DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS
) {
super(pool, opts)
- this.setTaskStatistics(this.opts)
+ this.setTaskStatistics
Requirements
(this.opts)
}
/** @inheritDoc */
}
/** @inheritDoc */
@@
-54,14
+62,16
@@
export class LeastBusyWorkerChoiceStrategy<
/** @inheritDoc */
public choose (): number {
/** @inheritDoc */
public choose (): number {
- let min
Run
Time = Infinity
+ let minTime = Infinity
let leastBusyWorkerNodeKey!: number
for (const [workerNodeKey, workerNode] of this.pool.workerNodes.entries()) {
let leastBusyWorkerNodeKey!: number
for (const [workerNodeKey, workerNode] of this.pool.workerNodes.entries()) {
- const workerRunTime = workerNode.workerUsage.runTime.aggregation
- if (workerRunTime === 0) {
+ const workerTime =
+ workerNode.workerUsage.runTime.aggregate +
+ workerNode.workerUsage.waitTime.aggregate
+ if (workerTime === 0) {
return workerNodeKey
return workerNodeKey
- } else if (worker
RunTime < minRu
nTime) {
- min
RunTime = workerRun
Time
+ } else if (worker
Time < mi
nTime) {
+ min
Time = worker
Time
leastBusyWorkerNodeKey = workerNodeKey
}
}
leastBusyWorkerNodeKey = workerNodeKey
}
}