@overkill-dev/run 0.0.58 → 0.0.59
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/engine/case-execution.d.ts +2 -2
- package/engine/case-execution.d.ts.map +1 -1
- package/engine/case-execution.js +3 -3
- package/engine/case-execution.js.map +1 -1
- package/engine/engine.d.ts +2 -2
- package/engine/engine.d.ts.map +1 -1
- package/engine/execution-supervision.d.ts +3 -3
- package/engine/execution-supervision.d.ts.map +1 -1
- package/engine/execution-supervision.js +4 -4
- package/engine/execution-supervision.js.map +1 -1
- package/engine/execution-test-plan-cases.js +4 -4
- package/engine/execution-test-plan-cases.js.map +1 -1
- package/engine/execution.d.ts +2 -2
- package/engine/execution.d.ts.map +1 -1
- package/engine/execution.js +2 -2
- package/engine/execution.js.map +1 -1
- package/engine/reporter-dispatcher.d.ts +2 -2
- package/engine/reporter-dispatcher.d.ts.map +1 -1
- package/engine/run-timings.d.ts +7 -0
- package/engine/run-timings.d.ts.map +1 -1
- package/engine/run-timings.js +1 -0
- package/engine/run-timings.js.map +1 -1
- package/package.json +4 -1
- package/packages/engine/engine.entry-point.d.ts +1 -1
- package/packages/engine/engine.entry-point.d.ts.map +1 -1
- package/packages/engine/engine.entry-point.js +2 -2
- package/packages/engine/engine.entry-point.js.map +1 -1
- package/packages/reporter-line/reporter-line.entry-point.js +5 -0
- package/packages/reporter-line/reporter-line.entry-point.js.map +1 -1
- package/packages/run/run.entry-point.d.ts +1 -1
- package/packages/run/run.entry-point.d.ts.map +1 -1
- package/packages/run/run.entry-point.js +2 -2
- package/packages/run/run.entry-point.js.map +1 -1
- package/readme.md +4 -0
- package/reporters/progress-reporter.js +6 -0
- package/reporters/progress-reporter.js.map +1 -0
- package/reporters/tree-reporter.js +111 -0
- package/reporters/tree-reporter.js.map +1 -0
- package/run/default-run-engine.js +2 -2
- package/run/default-run-engine.js.map +1 -1
- package/run/placement-trace.d.ts +83 -40
- package/run/placement-trace.d.ts.map +1 -1
- package/run/placement-trace.js +80 -0
- package/run/placement-trace.js.map +1 -1
- package/run/resource-lifecycle-timing.js +3 -1
- package/run/resource-lifecycle-timing.js.map +1 -1
- package/run/resource-usage.d.ts +3 -3
- package/run/resource-usage.d.ts.map +1 -1
- package/run/resource-usage.js +1 -1
- package/run/resource-usage.js.map +1 -1
- package/run/run-collected-planning.js +1 -1
- package/run/run-collected-planning.js.map +1 -1
- package/run/run-empty-shard.js +3 -3
- package/run/run-empty-shard.js.map +1 -1
- package/run/run-if-main.d.ts +3 -3
- package/run/run-if-main.d.ts.map +1 -1
- package/run/run-if-main.js +2 -2
- package/run/run-if-main.js.map +1 -1
- package/run/run-isolated-process.js +4 -4
- package/run/run-isolated-process.js.map +1 -1
- package/run/run-local-execution.js +1 -1
- package/run/run-local-execution.js.map +1 -1
- package/run/run-local-resolution.js +2 -2
- package/run/run-local-resolution.js.map +1 -1
- package/run/run-orchestrator-dependencies.d.ts +2 -2
- package/run/run-orchestrator-dependencies.d.ts.map +1 -1
- package/run/run-orchestrator.js +2 -2
- package/run/run-orchestrator.js.map +1 -1
- package/run/run-support.js +1 -1
- package/run/run-support.js.map +1 -1
- package/run/run-timing-collection.d.ts +2 -2
- package/run/run-timing-collection.d.ts.map +1 -1
- package/run/run-timing-collection.js +28 -22
- package/run/run-timing-collection.js.map +1 -1
- package/run/supervised-child-process.d.ts +2 -2
- package/run/supervised-child-process.d.ts.map +1 -1
- package/run/supervised-child-process.js +1 -1
- package/run/supervised-child-process.js.map +1 -1
- package/run/supervised-child.entry-point.js +2 -2
- package/run/supervised-child.entry-point.js.map +1 -1
- package/run/supervised-child.js +4 -4
- package/run/supervised-child.js.map +1 -1
- package/run/supervised-protocol.js.map +1 -1
- package/run/supervised-run-collection.js +3 -3
- package/run/supervised-run-collection.js.map +1 -1
- package/run/supervised-run-runtime.js +5 -5
- package/run/supervised-run-runtime.js.map +1 -1
- package/run/supervised-run.js +8 -8
- package/run/supervised-run.js.map +1 -1
- package/run/worker-pool-collection.js +2 -2
- package/run/worker-pool-collection.js.map +1 -1
- package/run/worker-pool-compatible-batching.js +0 -10
- package/run/worker-pool-compatible-batching.js.map +1 -1
- package/run/worker-pool-dispatch-state.js.map +1 -1
- package/run/worker-pool-execution.js +37 -36
- package/run/worker-pool-execution.js.map +1 -1
- package/run/worker-pool-hedge-dispatch.js +1 -1
- package/run/worker-pool-hedge-dispatch.js.map +1 -1
- package/run/worker-pool-hedged-arbitration.js +31 -20
- package/run/worker-pool-hedged-arbitration.js.map +1 -1
- package/run/worker-pool-host.entry-point.js +2 -2
- package/run/worker-pool-host.entry-point.js.map +1 -1
- package/run/worker-pool-lease-selection.js.map +1 -1
- package/run/worker-pool-output.js +1 -1
- package/run/worker-pool-output.js.map +1 -1
- package/run/worker-pool-pending-splitting.js +4 -2
- package/run/worker-pool-pending-splitting.js.map +1 -1
- package/run/worker-pool-resource-tracking.js +1 -1
- package/run/worker-pool-resource-tracking.js.map +1 -1
- package/run/worker-pool-results.js +9 -6
- package/run/worker-pool-results.js.map +1 -1
- package/run/worker-pool-run.js +11 -7
- package/run/worker-pool-run.js.map +1 -1
- package/run/worker-pool-runtime.js +14 -6
- package/run/worker-pool-runtime.js.map +1 -1
- package/run/worker-pool-static-dispatcher.js +18 -8
- package/run/worker-pool-static-dispatcher.js.map +1 -1
- package/run/worker-pool-task-events.js +83 -25
- package/run/worker-pool-task-events.js.map +1 -1
- package/run/worker-pool-work-dispatcher.js +21 -13
- package/run/worker-pool-work-dispatcher.js.map +1 -1
- package/run/worker-pool-worker-resources.js +2 -2
- package/run/worker-pool-worker-resources.js.map +1 -1
- package/run/worker-pool-worker-timing.js +14 -7
- package/run/worker-pool-worker-timing.js.map +1 -1
- package/run/worker-pool-worker.js +20 -12
- package/run/worker-pool-worker.js.map +1 -1
- package/sbom.cdx.json +38 -4
- package/clock/overkill-clock.d.ts +0 -30
- package/clock/overkill-clock.d.ts.map +0 -1
- package/clock/overkill-clock.js +0 -53
- package/clock/overkill-clock.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-pool-results.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-results.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAQnE,OAAO,EACH,uBAAuB,EACvB,gCAAgC,EACnC,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,kCAAkC,EAAE,MAAM,4BAA4B,CAAC;AAEhF,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAIrE,OAAO,EACH,uBAAuB,
|
|
1
|
+
{"version":3,"file":"worker-pool-results.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-results.ts"],"names":[],"mappings":"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"}
|
package/run/worker-pool-run.js
CHANGED
|
@@ -3,7 +3,7 @@ import { collectInWorkerPool } from "./worker-pool-collection.js";
|
|
|
3
3
|
import { executeWorkerPoolUnits } from "./worker-pool-execution.js";
|
|
4
4
|
import { reportRunStart, startPoolResourceTracking } from "./worker-pool-resource-tracking.js";
|
|
5
5
|
import { createEmptyWorkerPoolResult, finishWorkerPoolRun } from "./worker-pool-results.js";
|
|
6
|
-
import { createWorkerPoolRuntime, workerPoolPlacementPlan } from "./worker-pool-runtime.js";
|
|
6
|
+
import { createWorkerPoolRuntime, createWorkerPoolPlacementTraceRecorder, workerPoolPlacementPlan } from "./worker-pool-runtime.js";
|
|
7
7
|
const emptyWorkerPoolTimingMetadata = Object.freeze({
|
|
8
8
|
label: null,
|
|
9
9
|
processId: null,
|
|
@@ -45,8 +45,8 @@ async function createRuntime(resolvedRun, dependencies, state) {
|
|
|
45
45
|
collectionRunnerErrors: resolvedRun.collectionRunnerErrors,
|
|
46
46
|
createdPool: state.createdPool,
|
|
47
47
|
dependencies,
|
|
48
|
-
async finalizeResult(
|
|
49
|
-
return await state.finalizeResult(resolvedRun,
|
|
48
|
+
async finalizeResult(completion) {
|
|
49
|
+
return await state.finalizeResult(resolvedRun, completion);
|
|
50
50
|
},
|
|
51
51
|
resolvedRun,
|
|
52
52
|
runState: state.collectionRunState,
|
|
@@ -54,9 +54,9 @@ async function createRuntime(resolvedRun, dependencies, state) {
|
|
|
54
54
|
});
|
|
55
55
|
}
|
|
56
56
|
async function finishExecutionWithRuntime(resolvedRun, dependencies, state, runtime) {
|
|
57
|
-
const startedAtMilliseconds = dependencies.wallClock.
|
|
58
|
-
const startedAtMicroseconds = dependencies.wallClock.currentMonotonicMicroseconds;
|
|
59
|
-
const readyAtMicroseconds = dependencies.wallClock.currentMonotonicMicroseconds;
|
|
57
|
+
const startedAtMilliseconds = dependencies.wallClock.currentUnixEpochMilliseconds;
|
|
58
|
+
const startedAtMicroseconds = Number(dependencies.wallClock.currentMonotonicMicroseconds);
|
|
59
|
+
const readyAtMicroseconds = Number(dependencies.wallClock.currentMonotonicMicroseconds);
|
|
60
60
|
state.timing?.record({
|
|
61
61
|
completedAtMicroseconds: readyAtMicroseconds,
|
|
62
62
|
kind: 'worker-pool.ready',
|
|
@@ -68,7 +68,11 @@ async function finishExecutionWithRuntime(resolvedRun, dependencies, state, runt
|
|
|
68
68
|
}
|
|
69
69
|
async function executeWorkerPoolRunWithState(resolvedRun, dependencies, state) {
|
|
70
70
|
if (workerPoolPlacementPlan(resolvedRun).units.length === 0) {
|
|
71
|
-
|
|
71
|
+
const result = await createEmptyWorkerPoolResult(resolvedRun, dependencies, state.collectionRunState);
|
|
72
|
+
return await state.finalizeResult(resolvedRun, {
|
|
73
|
+
placementTrace: createWorkerPoolPlacementTraceRecorder().finish(),
|
|
74
|
+
result
|
|
75
|
+
});
|
|
72
76
|
}
|
|
73
77
|
const runtime = await createRuntime(resolvedRun, dependencies, state);
|
|
74
78
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-pool-run.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-run.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,wBAAwB,EAE3B,MAAM,2BAA2B,CAAC;AAInC,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EACH,sBAAsB,EACzB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACH,cAAc,EACd,yBAAyB,EAC5B,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EACH,2BAA2B,EAC3B,mBAAmB,EACtB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACH,uBAAuB,EACvB,uBAAuB,
|
|
1
|
+
{"version":3,"file":"worker-pool-run.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-run.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { createPlacementTraceRecorder } from "./placement-trace.js";
|
|
1
2
|
import { createReporterDelivery, createReporterEventQueue } from "./supervised-run-runtime.js";
|
|
2
3
|
import { createStoredRunValue } from "./supervised-run-state.js";
|
|
3
4
|
import { loadTinypoolConstructor } from "./tinypool-node-compatibility.js";
|
|
@@ -6,6 +7,13 @@ import { createRoutedPool } from "./worker-pool-routing.js";
|
|
|
6
7
|
import { emptyTimingSpanMetadata } from "./run-timing-collection.js";
|
|
7
8
|
const Tinypool = loadTinypoolConstructor();
|
|
8
9
|
const workerPoolRunResourceOwnerLane = 'run-resource-owner';
|
|
10
|
+
export function workerPoolPlacementTrace(runtime) {
|
|
11
|
+
return runtime.placementTrace;
|
|
12
|
+
}
|
|
13
|
+
export function createWorkerPoolPlacementTraceRecorder() {
|
|
14
|
+
const recorder = createPlacementTraceRecorder();
|
|
15
|
+
return recorder;
|
|
16
|
+
}
|
|
9
17
|
function workerPoolEntryPointHref(worker) {
|
|
10
18
|
const entryPointWorkerName = worker.name;
|
|
11
19
|
const workerPoolEntryPointUrl = new URL('./worker-pool-worker.ts', import.meta.url);
|
|
@@ -224,13 +232,13 @@ export async function createWorkerPoolRuntime(input) {
|
|
|
224
232
|
const taskResults = [];
|
|
225
233
|
const executionPool = createExecutionPool(input, placementPlan);
|
|
226
234
|
const { destroyPool, pool } = executionPool;
|
|
227
|
-
const
|
|
235
|
+
const placementTrace = createPlacementTraceRecorder();
|
|
228
236
|
pool.setHostOutputSink?.(function recordHostOutput(stream, chunk) {
|
|
229
237
|
if (execution.capture === 'live') {
|
|
230
238
|
dependencies.liveOutput[stream].write(chunk);
|
|
231
239
|
return;
|
|
232
240
|
}
|
|
233
|
-
runState.recordCapturedOutput(stream, chunk, dependencies.wallClock.currentMonotonicMicroseconds);
|
|
241
|
+
runState.recordCapturedOutput(stream, chunk, Number(dependencies.wallClock.currentMonotonicMicroseconds));
|
|
234
242
|
});
|
|
235
243
|
return {
|
|
236
244
|
activeTasks: new Set(),
|
|
@@ -241,11 +249,11 @@ export async function createWorkerPoolRuntime(input) {
|
|
|
241
249
|
finalizeResult,
|
|
242
250
|
pool,
|
|
243
251
|
poolResourceUsageTracker: createPoolResourceUsageTracker(pool, resolvedRun, dependencies),
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
placementTraceEntries.push(entry);
|
|
252
|
+
placementTrace,
|
|
253
|
+
get placementTraceEntries() {
|
|
254
|
+
return placementTrace.entries();
|
|
248
255
|
},
|
|
256
|
+
previousPoolSample: createStoredRunValue(null),
|
|
249
257
|
reporterDelivery: await createReporterDelivery(resolvedRun, dependencies),
|
|
250
258
|
reporterEvents: createReporterEventQueue(),
|
|
251
259
|
resolvedRun,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-pool-runtime.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-runtime.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"worker-pool-runtime.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-runtime.ts"],"names":[],"mappings":"AAeA,OAAO,EACH,4BAA4B,EAQ/B,MAAM,sBAAsB,CAAC;AAO9B,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAA2B,MAAM,6BAA6B,CAAC;AACxH,OAAO,EAAE,oBAAoB,EAAgD,MAAM,2BAA2B,CAAC;AAC/G,OAAO,EAAE,uBAAuB,EAAyB,MAAM,kCAAkC,CAAC;AAClG,OAAO,EAAE,OAAO,IAAI,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAwB,MAAM,0BAA0B,CAAC;AAClF,OAAO,EACH,uBAAuB,EAE1B,MAAM,4BAA4B,CAAC;AAEpC,MAAM,QAAQ,GAAG,uBAAuB,EAAE,CAAC;AAC3C,MAAM,8BAA8B,GAAG,oBAAoB,CAAC;AAkG5D,MAAM,UAAU,wBAAwB,CAAC,OAA6B;IAClE,OAAO,OAAO,CAAC,cAAc,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,sCAAsC;IAClD,MAAM,QAAQ,GAAG,4BAA4B,EAAE,CAAC;IAEhD,OAAO,QAAQ,CAAC;AACpB,CAAC;AAYD,SAAS,wBAAwB,CAAC,MAAyC;IACvE,MAAM,oBAAoB,GAAG,MAAM,CAAC,IAAI,CAAC;IACzC,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAC,yBAAyB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEpF,OAAO,uBAAuB,CAAC,IAAI,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,wBAAwB,CAAC,0BAA0B,CAAC,CAAC;AAEzF,MAAM,UAAU,4BAA4B,CAAC,YAAoB;IAC7D,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,CAAC;IAEzC,OAAO,SAAS,CAAC,WAAW,EAAE,CAAC;AACnC,CAAC;AAQD,SAAS,cAAc,CAAC,OAAkC;IACtD,OAAO,OAAO,CAAC,eAAe,KAAK,uBAAuB,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,OAAkC;IACvE,OAAO,IAAI,QAAQ,CAAC;QAChB,wBAAwB,EAAE,CAAC;QAC3B,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,cAAc,EAAE,cAAc,CAAC,OAAO,CAAC;QACvC,UAAU,EAAE,OAAO,CAAC,WAAW;QAC/B,UAAU,EAAE,OAAO,CAAC,WAAW;QAC/B,OAAO,EAAE,gBAAgB;KAC5B,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,OAAkC;IACzD,OAAO,wBAAwB,CAAC;QAC5B,GAAG,OAAO;QACV,QAAQ,EAAE,oBAAoB;KACjC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,iBAAiB,CAAC,SAAmC;IAC1D,OAAO,SAAS,CAAC,WAAW,CAAC,IAAI,KAAK,QAAQ;QAC1C,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE;QACpB,CAAC,CAAC;YACE,IAAI,EAAE,OAAO;YACb,aAAa,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,aAAa,CAAC;SACjE,CAAC;AACV,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,WAAwB;IAC7D,IAAI,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,YAAY,KAAK,aAAa,EAAE,CAAC;QAC7D,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;IACnF,CAAC;IAED,OAAO,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC;AACvC,CAAC;AAED,SAAS,UAAU,CAAC,KAA0B;IAC1C,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,OAAO,CAAC,IAAI;QAC1C,OAAO,CAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI,CAAE,CAAC;IAC7C,CAAC,CAAC,CAAC,CAAC;AACR,CAAC;AAED,SAAS,aAAa,CAAC,IAAmB;IACtC,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAErC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,UAAU;QAClD,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;QAExD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC7E,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,aAAa,CAClB,cAAuD,EACvD,IAAY,EACZ,eAAmC;IAEnC,MAAM,iBAAiB,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,iBAAiB,KAAK,SAAS,IAAI,iBAAiB,KAAK,eAAe,EAAE,CAAC;QAC3E,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO,eAAe,CAAC;AAC3B,CAAC;AAED,SAAS,uBAAuB,CAAC,IAAmB;IAChD,MAAM,cAAc,GAAG,IAAI,GAAG,EAA8B,CAAC;IAC7D,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAElC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,mBAAmB,CAAC,UAAU,EAAE,KAAK;QACnE,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QAE1B,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC7E,CAAC;QAED,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,aAAa,CAAC,cAAc,EAAE,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;IAC9G,CAAC,CAAC,CAAC;IAEH,OAAO,cAAc,CAAC;AAC1B,CAAC;AAUD,SAAS,iBAAiB,CAAC,KAA6B;IACpD,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;IAE3E,OAAO;QACH,GAAG,EAAE,KAAK,CAAC,WAAW,CAAC,GAAG;QAC1B,WAAW,EAAE,iBAAiB,CAAC,KAAK,CAAC,SAAS,CAAC;QAC/C,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,UAAU;QACtC,GAAG,YAAY;QACf,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,eAAe,EAAE,KAAK,CAAC,eAAe;KACzC,CAAC;AACN,CAAC;AAED,SAAS,wBAAwB,CAC7B,KAA6B,EAC7B,SAAmC;IAEnC,OAAO;QACH,WAAW,EAAE,KAAK,CAAC,WAAW,KAAK,IAAI;QACvC,IAAI,EAAE,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,MAAM,EAAE,OAAO,CAC5C,mBAAmB,EACnB,uBAAuB,EAAE,EACzB,SAAS,0BAA0B;YAC/B,OAAO,KAAK,CAAC,YAAY,CAAC,gBAAgB,CACtC,iBAAiB,CAAC;gBACd,SAAS;gBACT,WAAW,EAAE,KAAK,CAAC,WAAW;gBAC9B,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,IAAI;gBAC5B,WAAW,EAAE,CAAC;gBACd,eAAe,EAAE,SAAS,CAAC,eAAe;aAC7C,CAAC,CACL,CAAC;QACN,CAAC,CACJ,IAAI,KAAK,CAAC,YAAY,CAAC,gBAAgB,CACpC,iBAAiB,CAAC;YACd,SAAS;YACT,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,IAAI;YAC5B,WAAW,EAAE,CAAC;YACd,eAAe,EAAE,SAAS,CAAC,eAAe;SAC7C,CAAC,CACL;KACJ,CAAC;AACN,CAAC;AAED,SAAS,yBAAyB,CAC9B,KAA6B,EAC7B,SAAmC,EACnC,WAAmB,EACnB,eAAmC;IAEnC,MAAM,OAAO,GAAG,iBAAiB,CAAC;QAC9B,SAAS;QACT,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,IAAI;QAC5B,WAAW;QACX,eAAe;KAClB,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC,MAAM,EAAE,OAAO,CACxB,mBAAmB,EACnB,uBAAuB,EAAE,EACzB,SAAS,qBAAqB;QAC1B,OAAO,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACxD,CAAC,CACJ,IAAI,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACtD,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,WAAwB;IAC5D,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAC;IACpF,CAAC;IAED,OAAO,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,kCAAkC,CAAC,WAAwB;IACvE,OAAO,uBAAuB,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,kBAAkB,CAAC,IAAI;QACnF,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,kBAAkB,CAAC,QAAQ;YACvD,OAAO,QAAQ,CAAC,mBAAmB,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,aAAa,CAAC,QAAQ;gBAClF,OAAO,QAAQ,CAAC,KAAK,KAAK,SAAS,CAAC;YACxC,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,sBAAsB,CAC3B,KAA6B,EAC7B,SAAmC,EACnC,qBAA8B;IAE9B,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACzB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,OAAO;QACH;YACI,IAAI,EAAE,8BAA8B;YACpC,IAAI,EAAE,yBAAyB,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,EAAE,OAAO,CAAC;YAC7D,eAAe,EAAE,OAAO;SAC3B;KACJ,CAAC;AACN,CAAC;AAED,SAAS,4BAA4B,CACjC,aAA4B,EAC5B,cAAuD,EACvD,qBAA8B;IAE9B,MAAM,CAAE,IAAI,CAAE,GAAG,aAAa,CAAC,KAAK,CAAC;IAErC,IAAI,aAAa,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACzD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,eAAe,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEpD,OAAO,eAAe,KAAK,SAAS,IAAI,CAAC,CAAC,qBAAqB,IAAI,eAAe,KAAK,OAAO,CAAC;QAC3F,CAAC,CAAC,eAAe;QACjB,CAAC,CAAC,IAAI,CAAC;AACf,CAAC;AAED,SAAS,uBAAuB,CAC5B,KAA6B,EAC7B,SAAmC,EACnC,aAA4B;IAE5B,MAAM,cAAc,GAAG,uBAAuB,CAAC,aAAa,CAAC,CAAC;IAC9D,MAAM,qBAAqB,GAAG,kCAAkC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACpF,MAAM,mBAAmB,GAAG,4BAA4B,CACpD,aAAa,EACb,cAAc,EACd,qBAAqB,CACxB,CAAC;IAEF,IAAI,mBAAmB,KAAK,IAAI,EAAE,CAAC;QAC/B,OAAO;YACH,WAAW,EAAE,KAAK,CAAC,WAAW,KAAK,IAAI;YACvC,IAAI,EAAE,KAAK,CAAC,WAAW,IAAI,yBAAyB,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,EAAE,mBAAmB,CAAC;SACjG,CAAC;IACN,CAAC;IAED,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,OAAO,CAAC,IAAI;QACxD,MAAM,eAAe,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEpD,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACxE,CAAC;QAED,OAAO;YACH,IAAI,EAAE,IAAI,CAAC,EAAE;YACb,IAAI,EAAE,yBAAyB,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,EAAE,eAAe,CAAC;YACrE,eAAe;SAClB,CAAC;IACN,CAAC,CAAC,CAAC;IACH,MAAM,WAAW,GAAG,sBAAsB,CAAC,KAAK,EAAE,SAAS,EAAE,qBAAqB,CAAC,CAAC;IAEpF,OAAO;QACH,WAAW,EAAE,IAAI;QACjB,IAAI,EAAE,gBAAgB,CAAC,CAAE,GAAG,MAAM,EAAE,GAAG,WAAW,CAAE,CAAC;KACxD,CAAC;AACN,CAAC;AAED,SAAS,mBAAmB,CAAC,KAA6B,EAAE,aAA4B;IACpF,MAAM,SAAS,GAAG,wBAAwB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAE9D,IAAI,aAAa,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnC,OAAO,wBAAwB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACtD,CAAC;IAED,OAAO,uBAAuB,CAAC,KAAK,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;AACpE,CAAC;AAED,SAAS,8BAA8B,CACnC,IAAsB,EACtB,WAAwB,EACxB,YAAyC;IAEzC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC;QAC3D,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,IAAI,CAAC,0BAA0B,KAAK,SAAS,EAAE,CAAC;QAChD,OAAO,IAAI,CAAC,0BAA0B,CAAC;YACnC,4BAA4B,EAAE,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,mBAAmB,CAAC,4BAA4B;SAC7G,CAAC,CAAC;IACP,CAAC;IAED,OAAO,YAAY,CAAC,0BAA0B,CAAC;QAC3C,4BAA4B,EAAE,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,mBAAmB,CAAC,4BAA4B;KAC7G,CAAC,CAAC;AACP,CAAC;AACD,MAAM,UAAU,uBAAuB,CAAC,WAAwB;IAC5D,MAAM,EAAE,aAAa,EAAE,GAAG,wBAAwB,CAAC,WAAW,CAAC,CAAC;IAEhE,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,aAAa,CAAC;AACzB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CACzC,KAA6B;IAE7B,MAAM,EAAE,sBAAsB,EAAE,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAC9F,MAAM,aAAa,GAAG,uBAAuB,CAAC,WAAW,CAAC,CAAC;IAC3D,MAAM,SAAS,GAAG,wBAAwB,CAAC,WAAW,CAAC,CAAC;IACxD,MAAM,WAAW,GAAgB,EAAE,CAAC;IACpC,MAAM,aAAa,GAAG,mBAAmB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IAChE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;IAC5C,MAAM,cAAc,GAAG,4BAA4B,EAAE,CAAC;IAEtD,IAAI,CAAC,iBAAiB,EAAE,CAAC,SAAS,gBAAgB,CAAC,MAAM,EAAE,KAAK;QAC5D,IAAI,SAAS,CAAC,OAAO,KAAK,MAAM,EAAE,CAAC;YAC/B,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAE7C,OAAO;QACX,CAAC;QAED,QAAQ,CAAC,oBAAoB,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC,CAAC;IAC9G,CAAC,CAAC,CAAC;IAEH,OAAO;QACH,WAAW,EAAE,IAAI,GAAG,EAAE;QACtB,aAAa,EAAE,uBAAuB,CAAC,WAAW,CAAC;QACnD,sBAAsB;QACtB,YAAY;QACZ,WAAW;QACX,cAAc;QACd,IAAI;QACJ,wBAAwB,EAAE,8BAA8B,CAAC,IAAI,EAAE,WAAW,EAAE,YAAY,CAAC;QACzF,cAAc;QACd,IAAI,qBAAqB;YACrB,OAAO,cAAc,CAAC,OAAO,EAAE,CAAC;QACpC,CAAC;QACD,kBAAkB,EAAE,oBAAoB,CAA+B,IAAI,CAAC;QAC5E,gBAAgB,EAAE,MAAM,sBAAsB,CAAC,WAAW,EAAE,YAAY,CAAC;QACzE,cAAc,EAAE,wBAAwB,EAAE;QAC1C,WAAW;QACX,QAAQ;QACR,WAAW;QACX,eAAe,EAAE,oBAAoB,CAAC,KAAK,CAAC;QAC5C,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,IAAI;QAC5B,SAAS,EAAE;YACP,KAAK,EAAE,YAAY,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE;SAC9C;KACJ,CAAC;AACN,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { createWorkUnitQueue } from "./worker-pool-dispatch-state.js";
|
|
2
|
+
import { createPlacementTraceRecorder } from "./placement-trace.js";
|
|
2
3
|
function workUnitIdKey(unit) {
|
|
3
4
|
return JSON.stringify(unit);
|
|
4
5
|
}
|
|
@@ -23,10 +24,10 @@ function unitsAssignedToLane(plan, lane) {
|
|
|
23
24
|
if (assignment.lane !== lane.id) {
|
|
24
25
|
return [];
|
|
25
26
|
}
|
|
26
|
-
return [knownUnit(units, assignment.unit)];
|
|
27
|
+
return [{ previousAttempt: null, unit: knownUnit(units, assignment.unit) }];
|
|
27
28
|
});
|
|
28
29
|
}
|
|
29
|
-
export function createStaticDispatcher(plan) {
|
|
30
|
+
export function createStaticDispatcher(plan, placementTrace = createPlacementTraceRecorder()) {
|
|
30
31
|
const queues = new Map(plan.lanes.map(function toLaneQueue(lane) {
|
|
31
32
|
return [lane.id, createWorkUnitQueue(unitsAssignedToLane(plan, lane))];
|
|
32
33
|
}));
|
|
@@ -46,17 +47,23 @@ export function createStaticDispatcher(plan) {
|
|
|
46
47
|
return undefined;
|
|
47
48
|
},
|
|
48
49
|
pull(lane) {
|
|
49
|
-
const
|
|
50
|
-
return
|
|
50
|
+
const item = queues.get(lane.id)?.takeFirst() ?? null;
|
|
51
|
+
return item === null
|
|
51
52
|
? null
|
|
52
53
|
: {
|
|
53
54
|
envelopeId: null,
|
|
54
55
|
kind: 'primary',
|
|
55
56
|
lane,
|
|
56
|
-
members: [{
|
|
57
|
+
members: [{
|
|
58
|
+
attempt: placementTrace.assignAttempt(item.unit.id, item.unit.work, lane.id, item.previousAttempt === null
|
|
59
|
+
? { kind: 'initial' }
|
|
60
|
+
: { kind: 'recovery', previousAttempt: item.previousAttempt }),
|
|
61
|
+
traceUnit: item.unit.id,
|
|
62
|
+
unit: item.unit
|
|
63
|
+
}],
|
|
57
64
|
reservation: { faultDomains: [], hardKeys: [] },
|
|
58
|
-
traceUnit: unit.id,
|
|
59
|
-
unit
|
|
65
|
+
traceUnit: item.unit.id,
|
|
66
|
+
unit: item.unit
|
|
60
67
|
};
|
|
61
68
|
},
|
|
62
69
|
requeue(requeuedUnit) {
|
|
@@ -64,7 +71,10 @@ export function createStaticDispatcher(plan) {
|
|
|
64
71
|
if (lane === undefined) {
|
|
65
72
|
throw new Error('Static worker-pool dispatch cannot requeue an unassigned work unit.');
|
|
66
73
|
}
|
|
67
|
-
queues.get(lane)?.push(
|
|
74
|
+
queues.get(lane)?.push({
|
|
75
|
+
previousAttempt: requeuedUnit.previousAttempt,
|
|
76
|
+
unit: requeuedUnit.unit
|
|
77
|
+
});
|
|
68
78
|
},
|
|
69
79
|
async waitForChange() {
|
|
70
80
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-pool-static-dispatcher.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-static-dispatcher.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAiC,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"worker-pool-static-dispatcher.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-static-dispatcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { createDefaultWorkId, workIdentityKey } from "../engine/identity.js";
|
|
|
2
2
|
import { permissionDeniedRunnerErrorFromThrown } from "../engine/run-result.js";
|
|
3
3
|
import { applyEvent } from "./supervised-run-runtime.js";
|
|
4
4
|
import { crashError } from "./supervised-run-resource-policy.js";
|
|
5
|
+
import { workerPoolPlacementTrace } from "./worker-pool-runtime.js";
|
|
5
6
|
function memberUnits(taskRun) {
|
|
6
7
|
return taskRun.members.map(function toUnit(member) {
|
|
7
8
|
return member.unit;
|
|
@@ -39,11 +40,58 @@ function singleActiveCase(taskRun) {
|
|
|
39
40
|
function attributedWork(activeCase) {
|
|
40
41
|
return activeCase === null ? null : activeCase.workId ?? createDefaultWorkId(activeCase.id);
|
|
41
42
|
}
|
|
43
|
+
function nonEmptyWork(work) {
|
|
44
|
+
const [first, ...remaining] = work;
|
|
45
|
+
return first === undefined ? null : [first, ...remaining];
|
|
46
|
+
}
|
|
47
|
+
function abandonedWork(member, retryWork) {
|
|
48
|
+
const retryKeys = new Set(retryWork?.map(workIdentityKey));
|
|
49
|
+
return nonEmptyWork(member.unit.work.filter(function wasNotRetried(work) {
|
|
50
|
+
return !retryKeys.has(workIdentityKey(work));
|
|
51
|
+
}));
|
|
52
|
+
}
|
|
53
|
+
function abandonmentDecision(work) {
|
|
54
|
+
if (work === null) {
|
|
55
|
+
throw new Error('Interrupted placement attempt has no recovery work.');
|
|
56
|
+
}
|
|
57
|
+
return { abandonedWork: work, kind: 'abandon' };
|
|
58
|
+
}
|
|
59
|
+
function recoveryDecision(member, pending) {
|
|
60
|
+
const pendingMember = pending.find(function matchesAttempt(candidate) {
|
|
61
|
+
return candidate.attempt === member.attempt;
|
|
62
|
+
});
|
|
63
|
+
const retryWork = pendingMember === undefined ? null : nonEmptyWork(pendingMember.unit.work);
|
|
64
|
+
const abandoned = abandonedWork(member, retryWork);
|
|
65
|
+
if (retryWork === null) {
|
|
66
|
+
return abandonmentDecision(abandoned);
|
|
67
|
+
}
|
|
68
|
+
return abandoned === null
|
|
69
|
+
? { kind: 'retry', retryWork }
|
|
70
|
+
: { abandonedWork: abandoned, kind: 'partial', retryWork };
|
|
71
|
+
}
|
|
72
|
+
export function recordPlacementRecoveryDecisions(taskRun, pending, runtime, cause) {
|
|
73
|
+
const interruptedMembers = taskRun.members.filter(function wasInterrupted(member) {
|
|
74
|
+
return !taskRun.completedAttempts.has(member.attempt);
|
|
75
|
+
});
|
|
76
|
+
for (const member of interruptedMembers) {
|
|
77
|
+
workerPoolPlacementTrace(runtime).decideRecovery(member.attempt, cause, recoveryDecision(member, pending));
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
function interruptTaskAttempts(taskRun, runtime, cause) {
|
|
81
|
+
const incompleteMembers = taskRun.members.filter(function isIncomplete(member) {
|
|
82
|
+
return !taskRun.completedAttempts.has(member.attempt);
|
|
83
|
+
});
|
|
84
|
+
for (const member of incompleteMembers) {
|
|
85
|
+
workerPoolPlacementTrace(runtime).interruptAttempt(member.attempt, cause);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
42
88
|
function recordPermissionFailure(runnerError, taskRun, context) {
|
|
89
|
+
taskRun.interruptionCause.write('runtime-policy');
|
|
90
|
+
interruptTaskAttempts(taskRun, context.runtime, 'runtime-policy');
|
|
43
91
|
taskRun.endedByParent.write(true);
|
|
44
92
|
taskRun.requeuePendingCases.write(false);
|
|
45
93
|
taskRun.state.recordRunnerError(runnerError);
|
|
46
|
-
taskRun.state.recordTerminalActiveCases('runtime-policy', context.runtime.dependencies.wallClock.currentMonotonicMicroseconds);
|
|
94
|
+
taskRun.state.recordTerminalActiveCases('runtime-policy', Number(context.runtime.dependencies.wallClock.currentMonotonicMicroseconds));
|
|
47
95
|
context.runtime.terminalFailure.write(true);
|
|
48
96
|
context.dispatcher.clear();
|
|
49
97
|
context.stopActiveTasks(taskRun);
|
|
@@ -78,16 +126,34 @@ export function clearTaskTimeout(taskRun, dependencies) {
|
|
|
78
126
|
}
|
|
79
127
|
}
|
|
80
128
|
function recordWorkerCrashTrace(taskRun, runtime) {
|
|
81
|
-
runtime.
|
|
82
|
-
|
|
129
|
+
workerPoolPlacementTrace(runtime).recordDecision({
|
|
130
|
+
activeAttempt: taskRun.activeAttempt.read(),
|
|
83
131
|
kind: 'worker-crashed',
|
|
84
|
-
|
|
132
|
+
lane: taskRun.lane,
|
|
133
|
+
workerId: taskRun.workerId.read()
|
|
85
134
|
});
|
|
86
135
|
}
|
|
87
|
-
export function recordTaskCrash(taskRun, runtime, message) {
|
|
136
|
+
export function recordTaskCrash(taskRun, runtime, cause, message) {
|
|
137
|
+
if (taskRun.interruptionCause.read() !== null) {
|
|
138
|
+
return;
|
|
139
|
+
}
|
|
140
|
+
taskRun.interruptionCause.write(cause);
|
|
141
|
+
interruptTaskAttempts(taskRun, runtime, cause);
|
|
88
142
|
recordWorkerCrashTrace(taskRun, runtime);
|
|
89
143
|
taskRun.state.recordRunnerError(crashError(taskRun.state, message));
|
|
90
|
-
taskRun.state.recordTerminalActiveCases('crashed', runtime.dependencies.wallClock.currentMonotonicMicroseconds);
|
|
144
|
+
taskRun.state.recordTerminalActiveCases('crashed', Number(runtime.dependencies.wallClock.currentMonotonicMicroseconds));
|
|
145
|
+
}
|
|
146
|
+
export function stopWorkerPoolTasks(runtime, excludedTask, cause, message) {
|
|
147
|
+
const stoppedTasks = Array.from(runtime.activeTasks).filter(function isIncludedTask(activeTask) {
|
|
148
|
+
return activeTask !== excludedTask;
|
|
149
|
+
});
|
|
150
|
+
for (const activeTask of stoppedTasks) {
|
|
151
|
+
activeTask.endedByParent.write(true);
|
|
152
|
+
activeTask.requeuePendingCases.write(false);
|
|
153
|
+
recordTaskCrash(activeTask, runtime, cause, message);
|
|
154
|
+
clearTaskTimeout(activeTask, runtime.dependencies);
|
|
155
|
+
activeTask.controller.abort();
|
|
156
|
+
}
|
|
91
157
|
}
|
|
92
158
|
function startTaskTimeout(taskRun, runtime) {
|
|
93
159
|
if (taskRun.timeout.read() !== null) {
|
|
@@ -96,7 +162,7 @@ function startTaskTimeout(taskRun, runtime) {
|
|
|
96
162
|
taskRun.timeout.write(runtime.dependencies.wallClock.setTimeout(function abortTimedOutWorker() {
|
|
97
163
|
taskRun.endedByParent.write(true);
|
|
98
164
|
taskRun.requeuePendingCases.write(true);
|
|
99
|
-
recordTaskCrash(taskRun, runtime, 'Worker-pool work unit exceeded hard timeout.');
|
|
165
|
+
recordTaskCrash(taskRun, runtime, 'hard-timeout', 'Worker-pool work unit exceeded hard timeout.');
|
|
100
166
|
taskRun.controller.abort();
|
|
101
167
|
}, runtime.resolvedRun.facts.execution.timeoutPolicy.hardMilliseconds));
|
|
102
168
|
}
|
|
@@ -117,7 +183,7 @@ function handleWorkerEvent(event, taskRun, runtime) {
|
|
|
117
183
|
startTaskTimeout(taskRun, runtime);
|
|
118
184
|
}
|
|
119
185
|
const reportedEvent = eventWithTaskArtifacts(event, taskRun);
|
|
120
|
-
applyEvent(reportedEvent, taskRun.state, casesByKey(taskRun), runtime.dependencies.wallClock.currentMonotonicMicroseconds);
|
|
186
|
+
applyEvent(reportedEvent, taskRun.state, casesByKey(taskRun), Number(runtime.dependencies.wallClock.currentMonotonicMicroseconds));
|
|
121
187
|
if (reportedEvent.kind === 'test-end' && taskRun.state.activeCases.size === 0) {
|
|
122
188
|
clearTaskTimeout(taskRun, runtime.dependencies);
|
|
123
189
|
}
|
|
@@ -129,33 +195,25 @@ function handleWorkerEvent(event, taskRun, runtime) {
|
|
|
129
195
|
}
|
|
130
196
|
}
|
|
131
197
|
function handleUnitStarted(message, taskRun, runtime) {
|
|
132
|
-
taskRun.
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
lane: taskRun.lane,
|
|
136
|
-
unit: message.traceUnit,
|
|
137
|
-
workerId: taskRun.lane
|
|
138
|
-
});
|
|
198
|
+
taskRun.activeAttempt.write(message.attempt);
|
|
199
|
+
taskRun.workerId.write(message.workerId);
|
|
200
|
+
workerPoolPlacementTrace(runtime).startAttempt(message.attempt, message.workerId);
|
|
139
201
|
}
|
|
140
202
|
function handleUnitCompleted(message, taskRun, runtime) {
|
|
141
|
-
runtime.
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
workerId: taskRun.lane
|
|
146
|
-
});
|
|
147
|
-
if (taskRun.activeTraceUnit.read() === message.traceUnit) {
|
|
148
|
-
taskRun.activeTraceUnit.write(null);
|
|
203
|
+
workerPoolPlacementTrace(runtime).completeAttempt(message.attempt, message.durationMicroseconds);
|
|
204
|
+
taskRun.completedAttempts.add(message.attempt);
|
|
205
|
+
if (taskRun.activeAttempt.read() === message.attempt) {
|
|
206
|
+
taskRun.activeAttempt.write(null);
|
|
149
207
|
}
|
|
150
208
|
}
|
|
151
209
|
export function handleWorkerMessage(message, taskRun, runtime) {
|
|
152
210
|
if (message.kind === 'output') {
|
|
153
211
|
taskRun.state.recordCapturedOutput(message.stream, Buffer.from(message.chunk), message.capturedAtMicroseconds);
|
|
154
212
|
}
|
|
155
|
-
else if (message.kind === '
|
|
213
|
+
else if (message.kind === 'attempt-started') {
|
|
156
214
|
handleUnitStarted(message, taskRun, runtime);
|
|
157
215
|
}
|
|
158
|
-
else if (message.kind === '
|
|
216
|
+
else if (message.kind === 'attempt-completed') {
|
|
159
217
|
handleUnitCompleted(message, taskRun, runtime);
|
|
160
218
|
}
|
|
161
219
|
else if (message.kind === 'timing') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-pool-task-events.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-task-events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAe,MAAM,uBAAuB,CAAC;AAC1F,OAAO,EAAE,qCAAqC,EAAoB,MAAM,yBAAyB,CAAC;AAElG,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"worker-pool-task-events.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-task-events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAe,MAAM,uBAAuB,CAAC;AAC1F,OAAO,EAAE,qCAAqC,EAAoB,MAAM,yBAAyB,CAAC;AAElG,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAGjE,OAAO,EACH,wBAAwB,EAG3B,MAAM,0BAA0B,CAAC;AAiBlC,SAAS,WAAW,CAAC,OAA0B;IAC3C,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,MAAM;QAC7C,OAAO,MAAM,CAAC,IAAI,CAAC;IACvB,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,4BAA4B,CAAC,OAA0B,EAAE,KAA0B;IACxF,OAAO,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC,CAAC;AACrE,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,UAAoC,EAAE,KAA0B;IACjG,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE;QACrB,WAAW,EAAE,KAAK,CAAC,IAAI,KAAK,SAAS;QACrC,iBAAiB,EAAE,KAAK,CAAC,IAAI,KAAK,SAAS;QAC3C,aAAa,EAAE,KAAK;KACvB,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC7B,UAAoC,EACpC,OAA0B,EAC1B,KAA0B;IAE1B,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE;QACrB,WAAW,EAAE,KAAK;QAClB,iBAAiB,EAAE,4BAA4B,CAAC,OAAO,EAAE,KAAK,CAAC;QAC/D,aAAa,EAAE,IAAI;KACtB,CAAC,CAAC;AACP,CAAC;AAED,SAAS,UAAU,CAAC,OAA0B;IAC1C,OAAO,IAAI,GAAG,CACV,WAAW,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,SAAS,WAAW,CAAC,IAAI;QAClD,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,WAAW,CAAC,IAAI;YAC1C,OAAO,CAAE,eAAe,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAW,CAAC;QAC9F,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CACL,CAAC;AACN,CAAC;AAED,SAAS,gBAAgB,CAAC,OAA0B;IAChD,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;IACnE,MAAM,CAAE,UAAU,CAAE,GAAG,WAAW,CAAC;IAEnC,OAAO,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC;AACpF,CAAC;AAED,SAAS,cAAc,CAAC,UAAiC;IACrD,OAAO,UAAU,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,IAAI,mBAAmB,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;AAChG,CAAC;AAED,SAAS,YAAY,CAAC,IAAuB;IACzC,MAAM,CAAE,KAAK,EAAE,GAAG,SAAS,CAAE,GAAG,IAAI,CAAC;IAErC,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAE,KAAK,EAAE,GAAG,SAAS,CAAE,CAAC;AAChE,CAAC;AAED,SAAS,aAAa,CAClB,MAA4C,EAC5C,SAAmC;IAEnC,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC;IAE3D,OAAO,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,aAAa,CAAC,IAAI;QACnE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC,CAAC;AACR,CAAC;AAED,SAAS,mBAAmB,CACxB,IAAoD;IAEpD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;IAC3E,CAAC;IAED,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;AACpD,CAAC;AAED,SAAS,gBAAgB,CACrB,MAA4C,EAC5C,OAAyC;IAEzC,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,cAAc,CAAC,SAAS;QAChE,OAAO,SAAS,CAAC,OAAO,KAAK,MAAM,CAAC,OAAO,CAAC;IAChD,CAAC,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7F,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAEnD,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;QACrB,OAAO,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC;IAED,OAAO,SAAS,KAAK,IAAI;QACrB,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE;QAC9B,CAAC,CAAC,EAAE,aAAa,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,gCAAgC,CAC5C,OAA0B,EAC1B,OAAyC,EACzC,OAA6B,EAC7B,KAAwC;IAExC,MAAM,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,cAAc,CAAC,MAAM;QAC5E,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,KAAK,MAAM,MAAM,IAAI,kBAAkB,EAAE,CAAC;QACtC,wBAAwB,CAAC,OAAO,CAAC,CAAC,cAAc,CAC5C,MAAM,CAAC,OAAO,EACd,KAAK,EACL,gBAAgB,CAAC,MAAM,EAAE,OAAO,CAAC,CACpC,CAAC;IACN,CAAC;AACL,CAAC;AAED,SAAS,qBAAqB,CAC1B,OAA0B,EAC1B,OAA6B,EAC7B,KAAwC;IAExC,MAAM,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,YAAY,CAAC,MAAM;QACzE,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,KAAK,MAAM,MAAM,IAAI,iBAAiB,EAAE,CAAC;QACrC,wBAAwB,CAAC,OAAO,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC9E,CAAC;AACL,CAAC;AAED,SAAS,uBAAuB,CAC5B,WAAwB,EACxB,OAA0B,EAC1B,OAA2C;IAE3C,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAClD,qBAAqB,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAClE,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClC,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACzC,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAC7C,OAAO,CAAC,KAAK,CAAC,yBAAyB,CACnC,gBAAgB,EAChB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAC9E,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5C,OAAO,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAC3B,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,2BAA2B,CACvC,KAAc,EACd,OAA0B,EAC1B,OAA2C;IAE3C,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC7C,MAAM,WAAW,GAAG,qCAAqC,CAAC,KAAK,EAAE;QAC7D,YAAY,EAAE,UAAU,EAAE,EAAE,IAAI,IAAI;QACpC,gBAAgB,EAAE,cAAc,CAAC,UAAU,CAAC;QAC5C,QAAQ,EAAE,oBAAoB;QAC9B,iBAAiB,EAAE,IAAI;QACvB,IAAI,EAAE,IAAI;QACV,KAAK,EAAE,UAAU,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;KAC9C,CAAC,CAAC;IAEH,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;QACvB,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,uBAAuB,CAAC,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAEvD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,yBAAyB,CACpC,KAA2B,EAC3B,OAA6B;IAE7B,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAEjE,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;AACL,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC5B,OAA0B,EAC1B,YAAyC;IAEzC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IAEvC,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QACnB,YAAY,CAAC,SAAS,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC7C,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;AACL,CAAC;AAED,SAAS,sBAAsB,CAAC,OAA0B,EAAE,OAA6B;IACrF,wBAAwB,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC;QAC7C,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE;QAC3C,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE;KACpC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,eAAe,CAC3B,OAA0B,EAC1B,OAA6B,EAC7B,KAAwC,EACxC,OAAe;IAEf,IAAI,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;QAC5C,OAAO;IACX,CAAC;IACD,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACvC,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC/C,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;IACpE,OAAO,CAAC,KAAK,CAAC,yBAAyB,CACnC,SAAS,EACT,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,4BAA4B,CAAC,CACtE,CAAC;AACN,CAAC;AAED,MAAM,UAAU,mBAAmB,CAC/B,OAA6B,EAC7B,YAAsC,EACtC,KAAwC,EACxC,OAAe;IAEf,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,SAAS,cAAc,CAAC,UAAU;QAC1F,OAAO,UAAU,KAAK,YAAY,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,KAAK,MAAM,UAAU,IAAI,YAAY,EAAE,CAAC;QACpC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACrC,UAAU,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC5C,eAAe,CAAC,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QACrD,gBAAgB,CAAC,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QACnD,UAAU,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAClC,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,OAA0B,EAAE,OAA6B;IAC/E,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;QAClC,OAAO;IACX,CAAC;IAED,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,UAAU,CAAC,SAAS,mBAAmB;QACxF,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAClC,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACxC,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,8CAA8C,CAAC,CAAC;QAClG,OAAO,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAC/B,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC;AAC5E,CAAC;AAED,SAAS,sBAAsB,CAC3B,KAA2B,EAC3B,OAA0B;IAE1B,OAAO,KAAK,CAAC,IAAI,KAAK,UAAU;QAC5B,CAAC,CAAC;YACE,GAAG,KAAK;YACR,SAAS,EAAE;gBACP,GAAG,KAAK,CAAC,SAAS;gBAClB,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC;aAC7C;SACJ;QACD,CAAC,CAAC,KAAK,CAAC;AAChB,CAAC;AAED,SAAS,iBAAiB,CACtB,KAA2B,EAC3B,OAA0B,EAC1B,OAA6B;IAE7B,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QAC9B,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,CAAC,MAAM,IAAI,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3F,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,aAAa,GAAG,sBAAsB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAE7D,UAAU,CACN,aAAa,EACb,OAAO,CAAC,KAAK,EACb,UAAU,CAAC,OAAO,CAAC,EACnB,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,4BAA4B,CAAC,CACtE,CAAC;IAEF,IAAI,aAAa,CAAC,IAAI,KAAK,UAAU,IAAI,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QAC5E,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,OAAO,CAAC,sBAAsB,EAAE,CAAC;QACjC,OAAO,CAAC,sBAAsB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACvD,CAAC;SAAM,CAAC;QACJ,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,yBAAyB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;IAClF,CAAC;AACL,CAAC;AAED,SAAS,iBAAiB,CACtB,OAA0E,EAC1E,OAA0B,EAC1B,OAA6B;IAE7B,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACzC,wBAAwB,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;AACtF,CAAC;AAED,SAAS,mBAAmB,CACxB,OAA4E,EAC5E,OAA0B,EAC1B,OAA6B;IAE7B,wBAAwB,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACjG,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,IAAI,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC;QACnD,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,mBAAmB,CAC/B,OAA0B,EAC1B,OAA0B,EAC1B,OAA6B;IAE7B,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC5B,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAC9B,OAAO,CAAC,MAAM,EACd,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAC1B,OAAO,CAAC,sBAAsB,CACjC,CAAC;IACN,CAAC;SAAM,IAAI,OAAO,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;QAC5C,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;SAAM,IAAI,OAAO,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;QAC9C,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;SAAM,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACnC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;SAAM,CAAC;QACJ,iBAAiB,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACvD,CAAC;AACL,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { createStoredRunValue } from "./supervised-run-state.js";
|
|
2
|
+
import { workerPoolPlacementTrace } from "./worker-pool-runtime.js";
|
|
2
3
|
import { assignedWorkUnits, faultQuotas, laneLifecycles } from "./worker-pool-dynamic-plan.js";
|
|
3
4
|
import { createChangeWaiters, createDynamicReservations, createLeaseCounter, createWorkUnitQueue, faultReservationKey, hardConstraintKeys, uniqueText, workerPoolLeaseKey } from "./worker-pool-dispatch-state.js";
|
|
4
5
|
import { compareQueuePriority, fixedQueueItem, originalQueueItem, queuedWorkCanSplit, requeuedPriority, splitQueuedWorkUnit } from "./worker-pool-pending-splitting.js";
|
|
@@ -57,7 +58,7 @@ function createDynamicDispatchState(runtime, plan) {
|
|
|
57
58
|
return {
|
|
58
59
|
...state,
|
|
59
60
|
laneCanLeaseHedgeCandidate(entry, lane) {
|
|
60
|
-
return laneCanLease(state, fixedQueueItem(entry.lease.unit, entry.lease.traceUnit, requeuedPriority()), lane);
|
|
61
|
+
return laneCanLease(state, fixedQueueItem(entry.lease.unit, entry.lease.traceUnit, requeuedPriority(), { kind: 'initial' }), lane);
|
|
61
62
|
}
|
|
62
63
|
};
|
|
63
64
|
}
|
|
@@ -101,7 +102,7 @@ function recordActiveLease(state, lease) {
|
|
|
101
102
|
state.activeUnits.set(workerPoolLeaseKey(lease), {
|
|
102
103
|
lane: lease.lane,
|
|
103
104
|
lease,
|
|
104
|
-
startedAtMicroseconds: state.runtime.dependencies.wallClock.currentMonotonicMicroseconds
|
|
105
|
+
startedAtMicroseconds: Number(state.runtime.dependencies.wallClock.currentMonotonicMicroseconds)
|
|
105
106
|
});
|
|
106
107
|
if (lease.kind === 'hedged-duplicate') {
|
|
107
108
|
state.duplicateWork.add(unitHedgeWorkKey(lease.unit));
|
|
@@ -154,7 +155,7 @@ function splitPendingUnit(state, item) {
|
|
|
154
155
|
const split = splitQueuedWorkUnit(state.runtime, item);
|
|
155
156
|
state.pendingUnits.remove(item);
|
|
156
157
|
state.pendingUnits.pushMany(split.children);
|
|
157
|
-
state.runtime.
|
|
158
|
+
workerPoolPlacementTrace(state.runtime).recordDecision(split.traceEntry);
|
|
158
159
|
}
|
|
159
160
|
function selectPendingUnit(state, lane) {
|
|
160
161
|
const candidates = state
|
|
@@ -178,7 +179,7 @@ function selectPendingUnit(state, lane) {
|
|
|
178
179
|
warmLaneAffinity: state.warmLaneAffinity
|
|
179
180
|
});
|
|
180
181
|
if (selection.traceEntry !== null) {
|
|
181
|
-
state.runtime.
|
|
182
|
+
workerPoolPlacementTrace(state.runtime).recordDecision(selection.traceEntry);
|
|
182
183
|
}
|
|
183
184
|
return selection.item;
|
|
184
185
|
}
|
|
@@ -200,11 +201,19 @@ function leasePendingUnit(state, lane, item) {
|
|
|
200
201
|
for (const member of batch.members) {
|
|
201
202
|
state.pendingUnits.remove(member);
|
|
202
203
|
}
|
|
204
|
+
const [firstMember, ...remainingMembers] = batch.members;
|
|
205
|
+
const assignAttempt = function assignAttempt(member) {
|
|
206
|
+
return {
|
|
207
|
+
attempt: workerPoolPlacementTrace(state.runtime).assignAttempt(member.traceUnit, member.unit.work, lane.id, member.reason),
|
|
208
|
+
traceUnit: member.traceUnit,
|
|
209
|
+
unit: member.unit
|
|
210
|
+
};
|
|
211
|
+
};
|
|
203
212
|
const lease = {
|
|
204
213
|
envelopeId: batch.envelopeId,
|
|
205
214
|
kind: 'primary',
|
|
206
215
|
lane,
|
|
207
|
-
members:
|
|
216
|
+
members: [assignAttempt(firstMember), ...remainingMembers.map(assignAttempt)],
|
|
208
217
|
reservation: batch.reservation,
|
|
209
218
|
traceUnit: item.traceUnit,
|
|
210
219
|
unit: item.unit
|
|
@@ -217,17 +226,16 @@ function leaseHedgedDuplicate(state, lane, active) {
|
|
|
217
226
|
envelopeId: null,
|
|
218
227
|
kind: 'hedged-duplicate',
|
|
219
228
|
lane,
|
|
220
|
-
members: [{
|
|
229
|
+
members: [{
|
|
230
|
+
attempt: workerPoolPlacementTrace(state.runtime).assignAttempt(active.lease.traceUnit, active.lease.unit.work, lane.id, { kind: 'hedge', primaryAttempt: active.lease.members[0].attempt }),
|
|
231
|
+
traceUnit: active.lease.traceUnit,
|
|
232
|
+
unit: active.lease.unit
|
|
233
|
+
}],
|
|
221
234
|
reservation: freshReservation(state, active.lease.unit, lane),
|
|
222
235
|
traceUnit: active.lease.traceUnit,
|
|
223
236
|
unit: active.lease.unit
|
|
224
237
|
};
|
|
225
238
|
recordActiveLease(state, lease);
|
|
226
|
-
state.runtime.recordPlacementTraceEntry({
|
|
227
|
-
kind: 'hedged-duplicate-started',
|
|
228
|
-
unit: lease.traceUnit,
|
|
229
|
-
workerId: lane.id
|
|
230
|
-
});
|
|
231
239
|
return lease;
|
|
232
240
|
}
|
|
233
241
|
function pull(state, lane) {
|
|
@@ -288,7 +296,7 @@ function createDynamicDispatcher(runtime, plan) {
|
|
|
288
296
|
return pull(state, lane);
|
|
289
297
|
},
|
|
290
298
|
requeue(requeuedUnit) {
|
|
291
|
-
state.pendingUnits.push(fixedQueueItem(requeuedUnit.unit, requeuedUnit.traceUnit, requeuedPriority()));
|
|
299
|
+
state.pendingUnits.push(fixedQueueItem(requeuedUnit.unit, requeuedUnit.traceUnit, requeuedPriority(), { kind: 'recovery', previousAttempt: requeuedUnit.previousAttempt }));
|
|
292
300
|
state.waiters.notify();
|
|
293
301
|
},
|
|
294
302
|
async waitForChange() {
|
|
@@ -299,7 +307,7 @@ function createDynamicDispatcher(runtime, plan) {
|
|
|
299
307
|
export function createWorkDispatcher(runtime, plan) {
|
|
300
308
|
const { execution } = runtime.resolvedRun.facts;
|
|
301
309
|
if (execution.processModel !== 'worker-pool' || execution.dispatchPolicy === 'static-assignment') {
|
|
302
|
-
return createStaticDispatcher(plan);
|
|
310
|
+
return createStaticDispatcher(plan, workerPoolPlacementTrace(runtime));
|
|
303
311
|
}
|
|
304
312
|
return createDynamicDispatcher(runtime, plan);
|
|
305
313
|
}
|