@overkill-dev/run 0.0.45 → 0.0.46
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +8 -1
- package/packages/run/resource-lifecycle.entry-point.d.ts +5 -0
- package/packages/run/resource-lifecycle.entry-point.d.ts.map +1 -0
- package/packages/run/resource-lifecycle.entry-point.js +4 -0
- package/packages/run/resource-lifecycle.entry-point.js.map +1 -0
- package/readme.md +4 -0
- package/resources/resource-graph.d.ts +23 -0
- package/resources/resource-graph.d.ts.map +1 -0
- package/resources/resource-graph.js +132 -0
- package/resources/resource-graph.js.map +1 -0
- package/resources/resource-lifecycle-error.d.ts +19 -0
- package/resources/resource-lifecycle-error.d.ts.map +1 -0
- package/resources/resource-lifecycle-error.js +16 -0
- package/resources/resource-lifecycle-error.js.map +1 -0
- package/resources/resource-session.d.ts +28 -0
- package/resources/resource-session.d.ts.map +1 -0
- package/resources/resources.d.ts +175 -0
- package/resources/resources.d.ts.map +1 -0
- package/resources/resources.js +9 -0
- package/resources/resources.js.map +1 -0
- package/run/resource-lifecycle-composition.d.ts +37 -0
- package/run/resource-lifecycle-composition.d.ts.map +1 -0
- package/run/resource-lifecycle-composition.js +94 -0
- package/run/resource-lifecycle-composition.js.map +1 -0
- package/run/resource-lifecycle-error.d.ts +4 -0
- package/run/resource-lifecycle-error.d.ts.map +1 -0
- package/run/resource-lifecycle-error.js +17 -0
- package/run/resource-lifecycle-error.js.map +1 -0
- package/run/resource-lifecycle-managed-session.js +44 -0
- package/run/resource-lifecycle-managed-session.js.map +1 -0
- package/run/resource-lifecycle-state.d.ts +15 -0
- package/run/resource-lifecycle-state.d.ts.map +1 -0
- package/run/resource-lifecycle-state.js +16 -0
- package/run/resource-lifecycle-state.js.map +1 -0
- package/run/resource-lifecycle.js +320 -0
- package/run/resource-lifecycle.js.map +1 -0
- package/run/run-support.js +37 -0
- package/run/run-support.js.map +1 -1
- package/run/run-types.d.ts +9 -0
- package/run/run-types.d.ts.map +1 -1
- package/run/run-types.js +7 -0
- package/run/run-types.js.map +1 -1
- package/run/run.js +2 -2
- package/run/run.js.map +1 -1
- package/run/supervised-child.js +2 -1
- package/run/supervised-child.js.map +1 -1
- package/run/work-unit-planning.js +19 -3
- package/run/work-unit-planning.js.map +1 -1
- package/run/work-unit-resource-constraints.js +148 -0
- package/run/work-unit-resource-constraints.js.map +1 -0
- package/run/worker-pool-lanes.js +112 -1
- package/run/worker-pool-lanes.js.map +1 -1
- package/run/worker-pool-worker.js +4 -2
- package/run/worker-pool-worker.js.map +1 -1
- package/sbom.cdx.json +4 -4
package/run/worker-pool-lanes.js
CHANGED
|
@@ -116,15 +116,126 @@ function assignedLane(lanes, unitIndex) {
|
|
|
116
116
|
}
|
|
117
117
|
return lane;
|
|
118
118
|
}
|
|
119
|
+
function laneById(lanes, laneId) {
|
|
120
|
+
return lanes.find(function hasId(lane) {
|
|
121
|
+
return lane.id === laneId;
|
|
122
|
+
}) ?? null;
|
|
123
|
+
}
|
|
124
|
+
function firstFixedLane(unit, lanes, fixedLaneByKey) {
|
|
125
|
+
const fixedLane = [...unit.resourceConstraints.singleWorkerKeys, ...unit.resourceConstraints.serialKeys]
|
|
126
|
+
.map(function toFixedLane(key) {
|
|
127
|
+
return fixedLaneByKey.get(key) ?? null;
|
|
128
|
+
})
|
|
129
|
+
.find(function hasLaneId(laneId) {
|
|
130
|
+
return laneId !== null;
|
|
131
|
+
});
|
|
132
|
+
return fixedLane === undefined ? null : laneById(lanes, fixedLane);
|
|
133
|
+
}
|
|
134
|
+
function affinityScore(unit, lane, preferredLaneByAffinity) {
|
|
135
|
+
return unit
|
|
136
|
+
.resourceConstraints
|
|
137
|
+
.affinityKeys
|
|
138
|
+
.filter(function hasAffinity(key) {
|
|
139
|
+
return preferredLaneByAffinity.get(key) === lane.id;
|
|
140
|
+
})
|
|
141
|
+
.length;
|
|
142
|
+
}
|
|
143
|
+
function faultDomainScore(unit, lane, faultDomainLanes) {
|
|
144
|
+
return unit
|
|
145
|
+
.resourceConstraints
|
|
146
|
+
.faultDomains
|
|
147
|
+
.filter(function hasFaultDomain(key) {
|
|
148
|
+
return faultDomainLanes.get(key)?.has(lane.id) ?? false;
|
|
149
|
+
})
|
|
150
|
+
.length;
|
|
151
|
+
}
|
|
152
|
+
function laneLoad(lane, laneLoads) {
|
|
153
|
+
return laneLoads.get(lane.id) ?? 0;
|
|
154
|
+
}
|
|
155
|
+
function chooseLane(unit, lanes, state) {
|
|
156
|
+
const orderedLanes = lanes.toSorted(function compareLanes(left, right) {
|
|
157
|
+
const affinityDifference = affinityScore(unit, right, state.preferredLaneByAffinity) -
|
|
158
|
+
affinityScore(unit, left, state.preferredLaneByAffinity);
|
|
159
|
+
if (affinityDifference !== 0) {
|
|
160
|
+
return affinityDifference;
|
|
161
|
+
}
|
|
162
|
+
const faultDifference = faultDomainScore(unit, left, state.faultDomainLanes) -
|
|
163
|
+
faultDomainScore(unit, right, state.faultDomainLanes);
|
|
164
|
+
if (faultDifference !== 0) {
|
|
165
|
+
return faultDifference;
|
|
166
|
+
}
|
|
167
|
+
const loadDifference = laneLoad(left, state.laneLoads) - laneLoad(right, state.laneLoads);
|
|
168
|
+
return loadDifference === 0 ? left.id.localeCompare(right.id) : loadDifference;
|
|
169
|
+
});
|
|
170
|
+
const lane = orderedLanes[0];
|
|
171
|
+
if (lane === undefined) {
|
|
172
|
+
throw new Error('Worker-pool placement requires at least one lane.');
|
|
173
|
+
}
|
|
174
|
+
return lane;
|
|
175
|
+
}
|
|
176
|
+
function createLanePlacementState() {
|
|
177
|
+
const faultDomainLanes = new Map();
|
|
178
|
+
const fixedLaneByKey = new Map();
|
|
179
|
+
const laneLoads = new Map();
|
|
180
|
+
const preferredLaneByAffinity = new Map();
|
|
181
|
+
function rememberLaneChoice(unit, lane) {
|
|
182
|
+
laneLoads.set(lane.id, laneLoad(lane, laneLoads) + unit.resourceConstraints.capacityWeight);
|
|
183
|
+
for (const key of [...unit.resourceConstraints.singleWorkerKeys, ...unit.resourceConstraints.serialKeys]) {
|
|
184
|
+
fixedLaneByKey.set(key, lane.id);
|
|
185
|
+
}
|
|
186
|
+
for (const key of unit.resourceConstraints.affinityKeys) {
|
|
187
|
+
if (!preferredLaneByAffinity.has(key)) {
|
|
188
|
+
preferredLaneByAffinity.set(key, lane.id);
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
for (const key of unit.resourceConstraints.faultDomains) {
|
|
192
|
+
const lanesForDomain = faultDomainLanes.get(key) ?? new Set();
|
|
193
|
+
lanesForDomain.add(lane.id);
|
|
194
|
+
faultDomainLanes.set(key, lanesForDomain);
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
return {
|
|
198
|
+
chooseLane(unit, lanes) {
|
|
199
|
+
return chooseLane(unit, lanes, {
|
|
200
|
+
faultDomainLanes,
|
|
201
|
+
laneLoads,
|
|
202
|
+
preferredLaneByAffinity
|
|
203
|
+
});
|
|
204
|
+
},
|
|
205
|
+
firstFixedLane(unit, lanes) {
|
|
206
|
+
return firstFixedLane(unit, lanes, fixedLaneByKey);
|
|
207
|
+
},
|
|
208
|
+
rememberLaneChoice(unit, lane) {
|
|
209
|
+
rememberLaneChoice(unit, lane);
|
|
210
|
+
}
|
|
211
|
+
};
|
|
212
|
+
}
|
|
213
|
+
function requiresResourceAwareLane(unit) {
|
|
214
|
+
return unit.resourceConstraints.affinityKeys.length > 0 ||
|
|
215
|
+
unit.resourceConstraints.capacityWeight !== 1 ||
|
|
216
|
+
unit.resourceConstraints.faultDomains.length > 0;
|
|
217
|
+
}
|
|
218
|
+
function selectedLaneForUnit(unit, lanes, nextIndex, placementState) {
|
|
219
|
+
const fixedLane = placementState.firstFixedLane(unit, lanes);
|
|
220
|
+
if (fixedLane !== null) {
|
|
221
|
+
return fixedLane;
|
|
222
|
+
}
|
|
223
|
+
return requiresResourceAwareLane(unit)
|
|
224
|
+
? placementState.chooseLane(unit, lanes)
|
|
225
|
+
: assignedLane(lanes, nextIndex);
|
|
226
|
+
}
|
|
119
227
|
export function workerPoolPlacementAssignments(units, lanes) {
|
|
120
228
|
const lifecycleLanes = lanesByLifecycle(lanes, units);
|
|
121
229
|
const lifecycleIndexes = new Map();
|
|
230
|
+
const placementState = createLanePlacementState();
|
|
122
231
|
return units.map(function toAssignment(unit) {
|
|
123
232
|
const lanesForUnit = lifecycleLanes.get(unit.workerLifecycle) ?? [];
|
|
124
233
|
const nextIndex = lifecycleIndexes.get(unit.workerLifecycle) ?? 0;
|
|
234
|
+
const lane = selectedLaneForUnit(unit, lanesForUnit, nextIndex, placementState);
|
|
125
235
|
lifecycleIndexes.set(unit.workerLifecycle, nextIndex + 1);
|
|
236
|
+
placementState.rememberLaneChoice(unit, lane);
|
|
126
237
|
return {
|
|
127
|
-
lane:
|
|
238
|
+
lane: lane.id,
|
|
128
239
|
unit: unit.id
|
|
129
240
|
};
|
|
130
241
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-pool-lanes.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-lanes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAQjD,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAC7B,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,oBAAoB,GAAG,uBAAuB,CAAC;AACrD,MAAM,oBAAoB,GAAG,OAAO,CAAC;AACrC,MAAM,gBAAgB,GAAkC,CAAE,oBAAoB,EAAE,oBAAoB,CAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"worker-pool-lanes.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-lanes.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { createWallClock } from '@enormora/wall-clock';
|
|
|
2
2
|
import { createExecute } from "../engine/execution.js";
|
|
3
3
|
import { createReporterDispatcher } from "../engine/reporter-dispatcher.js";
|
|
4
4
|
import { createPlainOutputRenderer } from "../packages/engine/engine.entry-point.js";
|
|
5
|
+
import { createResourceLifecycleRuntimePolicy } from "./resource-lifecycle.js";
|
|
5
6
|
import { createNodeResourceUsageTracker } from "./resource-usage.js";
|
|
6
7
|
import { captureOutput, createWorkerPoolReporter, silentOutputSinks, suppressOutput } from "./worker-pool-output.js";
|
|
7
8
|
import { collectTestPlan, createEmptyAssignmentResult, selectedAssignedWork, sendCollectedPlan } from "./worker-pool-worker-plan.js";
|
|
@@ -53,13 +54,14 @@ async function runAssignment(task, wallClock) {
|
|
|
53
54
|
wallClock
|
|
54
55
|
});
|
|
55
56
|
try {
|
|
56
|
-
const
|
|
57
|
+
const testPlan = selectedAssignedWork(collectedPlan.testPlan, task.assignedWork);
|
|
58
|
+
const result = await execute(testPlan, {
|
|
57
59
|
execution: { mode: executionMode(task.command) },
|
|
58
60
|
outputRenderer: createPlainOutputRenderer(),
|
|
59
61
|
reporters: [createWorkerPoolReporter(task)],
|
|
60
62
|
resourceBudgets: workerResourceBudgets(task.command),
|
|
61
63
|
resourceUsageTracker: createResourceUsageTracker(task.command),
|
|
62
|
-
runtimePolicy:
|
|
64
|
+
runtimePolicy: createResourceLifecycleRuntimePolicy(testPlan.cases),
|
|
63
65
|
runFacts: {},
|
|
64
66
|
startedAt: startedAtIso(task.startedAtMilliseconds),
|
|
65
67
|
timeoutPolicy: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-pool-worker.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EACH,yBAAyB,EAE5B,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,EACH,aAAa,EACb,wBAAwB,EACxB,iBAAiB,EACjB,cAAc,EACjB,MAAM,yBAAyB,CAAC;AAQjC,OAAO,EACH,eAAe,EACf,2BAA2B,EAC3B,oBAAoB,EACpB,iBAAiB,EAEpB,MAAM,8BAA8B,CAAC;AAItC,SAAS,aAAa,CAAC,OAA0B;IAC7C,OAAO,OAAO,CAAC,UAAU,KAAK,YAAY,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,mBAAmB,CAAC;AAC/F,CAAC;AAED,SAAS,qBAAqB,CAAC,OAA0B;IACrD,OAAO;QACH,mBAAmB,EAAE,OAAO,CAAC,eAAe,CAAC,mBAAmB;QAChE,yBAAyB,EAAE,OAAO,CAAC,eAAe,CAAC,yBAAyB;QAC5E,gBAAgB,EAAE,IAAI;QACtB,+BAA+B,EAAE,IAAI;KACxC,CAAC;AACN,CAAC;AAED,SAAS,0BAA0B,CAAC,OAA0B;IAC1D,OAAO,8BAA8B,CAAC,eAAe,EAAE,EAAE;QACrD,4BAA4B,EAAE,OAAO,CAAC,yCAAyC;KAClF,CAAC,CAAC;AACP,CAAC;AAED,SAAS,YAAY,CAAC,qBAA6B;IAC/C,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAElD,OAAO,SAAS,CAAC,WAAW,EAAE,CAAC;AACnC,CAAC;AAED,SAAS,uBAAuB;IAC5B,OAAO,OAAO,CAAC,sBAAsB,EAAE,CAAC;AAC5C,CAAC;AAED,KAAK,UAAU,yBAAyB,CAAC,IAAuB;IAC5D,MAAM,eAAe,GAAG,cAAc,EAAE,CAAC;IAEzC,IAAI,CAAC;QACD,OAAO,MAAM,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;YAAS,CAAC;QACP,eAAe,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC;AACL,CAAC;AAED,KAAK,UAAU,aAAa,CACxB,IAAuB,EACvB,SAA6C;IAE7C,MAAM,aAAa,GAAG,MAAM,yBAAyB,CAAC,IAAI,CAAC,CAAC;IAE5D,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,OAAO,2BAA2B,CAAC,aAAa,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACtG,CAAC;IAED,MAAM,aAAa,GAAG,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACrD,MAAM,OAAO,GAAG,aAAa,CAAC;QAC1B,oBAAoB,EAAE,SAAS;QAC/B,uBAAuB;QACvB,kBAAkB,EAAE,wBAAwB,CAAC;YACzC,GAAG,iBAAiB;YACpB,SAAS;SACZ,CAAC;QACF,SAAS;KACZ,CAAC,CAAC;IAEH,IAAI,CAAC;QACD,MAAM,
|
|
1
|
+
{"version":3,"file":"worker-pool-worker.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-worker.ts"],"names":[],"mappings":"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"}
|
package/sbom.cdx.json
CHANGED
|
@@ -16,9 +16,9 @@
|
|
|
16
16
|
"component": {
|
|
17
17
|
"type": "library",
|
|
18
18
|
"name": "@overkill-dev/run",
|
|
19
|
-
"version": "0.0.
|
|
20
|
-
"bom-ref": "pkg:npm/@overkill-dev/run@0.0.
|
|
21
|
-
"purl": "pkg:npm/@overkill-dev/run@0.0.
|
|
19
|
+
"version": "0.0.46",
|
|
20
|
+
"bom-ref": "pkg:npm/@overkill-dev/run@0.0.46",
|
|
21
|
+
"purl": "pkg:npm/@overkill-dev/run@0.0.46"
|
|
22
22
|
}
|
|
23
23
|
},
|
|
24
24
|
"components": [
|
|
@@ -158,7 +158,7 @@
|
|
|
158
158
|
"ref": "pkg:npm/@enormora/wall-clock@0.0.3"
|
|
159
159
|
},
|
|
160
160
|
{
|
|
161
|
-
"ref": "pkg:npm/@overkill-dev/run@0.0.
|
|
161
|
+
"ref": "pkg:npm/@overkill-dev/run@0.0.46",
|
|
162
162
|
"dependsOn": [
|
|
163
163
|
"pkg:npm/@enormora/wall-clock@0.0.3",
|
|
164
164
|
"pkg:npm/@schema-hub/zod-error-formatter@0.0.16",
|