* test(acceptance): split competing loader ownership across files The loader matrix was one 578-second file, which set the floor for any shard that received it. Three files keep every CLI and MCP case and let workers overlap them. Co-authored-by: morluto <morluto@users.noreply.github.com> * perf(ci): run eight fast built shards under a ten-minute budget Charge each Vitest project by its resolved worker width so serial process-boundary files spread as tail time. Fast feedback uses eight built shards. The npm download cache stays; node_modules is too large to ship as a shared artifact. Co-authored-by: morluto <morluto@users.noreply.github.com> * fix(ci): keep each scheduled file on one worker lane Dividing a file by maxWorkers dropped its own wall-time floor and could pack a parallel file onto a serial tail. Place each file whole on a lane, overlap peers only inside a sequence group, and add later groups after. Co-authored-by: morluto <morluto@users.noreply.github.com> * docs(testing): separate the shard budget from workflow time The ten-minute figure is the built shard job. Classification, build, and the portable-test merge are measured separately on run 39451548945. Co-authored-by: morluto <morluto@users.noreply.github.com> * docs(testing): match fast shard count to lane scheduling Main still described five shards and half-duration weights. Fast qualification uses eight shards, and each file keeps its full duration on one worker. Co-authored-by: morluto <morluto@users.noreply.github.com> * fix(ci): seed split loader durations from pre-split history Timings published before the file split still name one 578-second path. Until a new file appears in that artifact, share the recorded duration by the pre-split case counts. Co-authored-by: morluto <morluto@users.noreply.github.com> --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: morluto <morluto@users.noreply.github.com>
275 lines
8.9 KiB
TypeScript
275 lines
8.9 KiB
TypeScript
import { readFile } from "node:fs/promises";
|
|
import { isAbsolute, relative, resolve, sep } from "node:path";
|
|
|
|
import { BaseSequencer, type TestSpecification } from "vitest/node";
|
|
import { z } from "zod";
|
|
|
|
const reportSchema = z.object({
|
|
version: z.literal(1),
|
|
success: z.literal(true),
|
|
files: z.array(z.unknown()),
|
|
});
|
|
const fileSchema = z.object({
|
|
name: z.string(),
|
|
durationMs: z.number().finite().positive(),
|
|
});
|
|
|
|
export function parseTestDurations(
|
|
contents: string,
|
|
root: string,
|
|
): Map<string, number> | undefined {
|
|
let value: unknown;
|
|
try {
|
|
value = JSON.parse(contents);
|
|
} catch (error) {
|
|
if (error instanceof SyntaxError) return undefined;
|
|
throw error;
|
|
}
|
|
const report = reportSchema.safeParse(value);
|
|
if (!report.success) return undefined;
|
|
|
|
const durations = new Map<string, number>();
|
|
for (const value of report.data.files) {
|
|
const result = fileSchema.safeParse(value);
|
|
if (!result.success) continue;
|
|
const { name, durationMs } = result.data;
|
|
const path = relative(root, resolve(root, name));
|
|
if (
|
|
path === "" ||
|
|
path === ".." ||
|
|
path.startsWith(".." + sep) ||
|
|
isAbsolute(path)
|
|
)
|
|
continue;
|
|
const key = path.split(sep).join("/");
|
|
durations.set(key, Math.max(durations.get(key) ?? 0, durationMs));
|
|
}
|
|
return durations.size ? durations : undefined;
|
|
}
|
|
|
|
export async function readTestDurations(
|
|
historyPath: string,
|
|
root: string,
|
|
): Promise<Map<string, number> | undefined> {
|
|
try {
|
|
return parseTestDurations(await readFile(historyPath, "utf8"), root);
|
|
} catch (error) {
|
|
if (error instanceof Error && "code" in error && error.code === "ENOENT")
|
|
return undefined;
|
|
throw error;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Case counts from the competing-loader file before it was split: 54 cases
|
|
* stayed in the original file and 46 moved into each of the three new files.
|
|
* History that still names only the original path is that combined cost.
|
|
*/
|
|
const LOADER_HISTORY_SOURCE =
|
|
"tests/acceptance/applications/javascriptLiteralPercentPaths.test.ts";
|
|
const LOADER_HISTORY_PARTS = [
|
|
"tests/acceptance/applications/javascriptLiteralLoaderOwnershipEarly.test.ts",
|
|
"tests/acceptance/applications/javascriptLiteralLoaderOwnershipMiddle.test.ts",
|
|
"tests/acceptance/applications/javascriptLiteralLoaderOwnershipLate.test.ts",
|
|
] as const;
|
|
const LOADER_HISTORY_REMAINDER_CASES = 54;
|
|
const LOADER_HISTORY_PART_CASES = 46;
|
|
const LOADER_HISTORY_CASES =
|
|
LOADER_HISTORY_REMAINDER_CASES +
|
|
LOADER_HISTORY_PART_CASES * LOADER_HISTORY_PARTS.length;
|
|
|
|
/**
|
|
* Give the split loader files a share of the pre-split duration. Once history
|
|
* records any of the new paths, their published durations stand.
|
|
*/
|
|
export function seedSplitLoaderDurations(
|
|
durations: ReadonlyMap<string, number>,
|
|
): Map<string, number> {
|
|
const combined = durations.get(LOADER_HISTORY_SOURCE);
|
|
if (
|
|
combined === undefined ||
|
|
LOADER_HISTORY_PARTS.some((path) => durations.has(path))
|
|
)
|
|
return new Map(durations);
|
|
const seeded = new Map(durations);
|
|
seeded.set(
|
|
LOADER_HISTORY_SOURCE,
|
|
(combined * LOADER_HISTORY_REMAINDER_CASES) / LOADER_HISTORY_CASES,
|
|
);
|
|
for (const path of LOADER_HISTORY_PARTS)
|
|
seeded.set(
|
|
path,
|
|
(combined * LOADER_HISTORY_PART_CASES) / LOADER_HISTORY_CASES,
|
|
);
|
|
return seeded;
|
|
}
|
|
|
|
type TimedItem<T> = {
|
|
item: T;
|
|
key: string;
|
|
duration: number | undefined;
|
|
/**
|
|
* Workers for this file's sequence group. The file still occupies one worker
|
|
* for its full duration; the other lanes only overlap its peers.
|
|
*/
|
|
laneWidth?: number;
|
|
/**
|
|
* Vitest sequence group. Groups run from lowest to highest, so a later group
|
|
* adds its own makespan instead of overlapping an earlier one.
|
|
*/
|
|
groupOrder?: number;
|
|
};
|
|
|
|
type Phase = { laneWidth: number; lanes: number[] };
|
|
|
|
const laneWidthOf = <T>(entry: TimedItem<T>): number => {
|
|
const laneWidth = entry.laneWidth ?? 1;
|
|
if (!Number.isInteger(laneWidth) || laneWidth < 1)
|
|
throw new RangeError("laneWidth must be a positive integer");
|
|
return laneWidth;
|
|
};
|
|
|
|
const groupOrderOf = <T>(entry: TimedItem<T>): number => {
|
|
const groupOrder = entry.groupOrder ?? 0;
|
|
if (!Number.isInteger(groupOrder) || groupOrder < 0)
|
|
throw new RangeError("groupOrder must be a non-negative integer");
|
|
return groupOrder;
|
|
};
|
|
|
|
const durationOf = <T>(entry: TimedItem<T>, unknownMs: number): number => {
|
|
const duration = entry.duration ?? unknownMs;
|
|
if (!Number.isFinite(duration) || duration <= 0)
|
|
throw new RangeError("duration must be positive");
|
|
return duration;
|
|
};
|
|
|
|
const wallOf = (phases: ReadonlyMap<number, Phase>): number => {
|
|
let wall = 0;
|
|
for (const phase of phases.values())
|
|
wall += phase.lanes.reduce((max, lane) => Math.max(max, lane), 0);
|
|
return wall;
|
|
};
|
|
|
|
/** Place one whole file on the least-loaded lane of its sequence group. */
|
|
const place = <T>(
|
|
phases: ReadonlyMap<number, Phase>,
|
|
entry: TimedItem<T>,
|
|
duration: number,
|
|
): Map<number, Phase> => {
|
|
const groupOrder = groupOrderOf(entry);
|
|
const laneWidth = laneWidthOf(entry);
|
|
const existing = phases.get(groupOrder);
|
|
if (existing && existing.laneWidth !== laneWidth)
|
|
throw new RangeError("one sequence group must keep a single lane width");
|
|
const lanes = existing
|
|
? existing.lanes.slice()
|
|
: Array.from({ length: laneWidth }, () => 0);
|
|
let shortest = 0;
|
|
for (let index = 1; index < lanes.length; index += 1)
|
|
if (lanes[index]! < lanes[shortest]!) shortest = index;
|
|
lanes[shortest] = lanes[shortest]! + duration;
|
|
const next = new Map(phases);
|
|
next.set(groupOrder, { laneWidth, lanes });
|
|
return next;
|
|
};
|
|
|
|
/**
|
|
* Wall time of one shard. Each file keeps its full duration on one worker.
|
|
* Files overlap only inside a sequence group, up to that group's lane width,
|
|
* and later groups run after earlier ones.
|
|
*/
|
|
export function scheduleWall<T>(
|
|
items: readonly TimedItem<T>[],
|
|
unknownMs: number,
|
|
): number {
|
|
const ordered = items.toSorted(
|
|
(left, right) =>
|
|
durationOf(right, unknownMs) - durationOf(left, unknownMs) ||
|
|
(left.key < right.key ? -1 : left.key > right.key ? 1 : 0),
|
|
);
|
|
return wallOf(
|
|
ordered.reduce(
|
|
(phases, entry) => place(phases, entry, durationOf(entry, unknownMs)),
|
|
new Map<number, Phase>(),
|
|
),
|
|
);
|
|
}
|
|
|
|
/** Distribute the longest files first, retaining every discovered specification. */
|
|
export function allocateByDuration<T>(
|
|
items: readonly TimedItem<T>[],
|
|
shardCount: number,
|
|
): T[][] | undefined {
|
|
if (!Number.isInteger(shardCount) || shardCount < 1)
|
|
throw new RangeError("shardCount must be a positive integer");
|
|
const known = items
|
|
.flatMap(({ duration }) => (duration === undefined ? [] : [duration]))
|
|
.sort((left, right) => left - right);
|
|
if (!known.length) return undefined;
|
|
const lower = known[Math.floor((known.length - 1) / 2)]!;
|
|
const median = lower + (known[Math.floor(known.length / 2)]! - lower) / 2;
|
|
const ordered = items.toSorted(
|
|
(left, right) =>
|
|
durationOf(right, median) - durationOf(left, median) ||
|
|
(left.key < right.key ? -1 : left.key > right.key ? 1 : 0),
|
|
);
|
|
const shards = Array.from({ length: shardCount }, () => ({
|
|
phases: new Map<number, Phase>(),
|
|
items: [] as T[],
|
|
}));
|
|
for (const entry of ordered) {
|
|
const duration = durationOf(entry, median);
|
|
let chosen = shards[0]!;
|
|
let chosenPhases = place(chosen.phases, entry, duration);
|
|
let chosenWall = wallOf(chosenPhases);
|
|
for (const candidate of shards.slice(1)) {
|
|
const phases = place(candidate.phases, entry, duration);
|
|
const wall = wallOf(phases);
|
|
if (wall < chosenWall) {
|
|
chosen = candidate;
|
|
chosenPhases = phases;
|
|
chosenWall = wall;
|
|
}
|
|
}
|
|
chosen.phases = chosenPhases;
|
|
chosen.items.push(entry.item);
|
|
}
|
|
return shards.map(({ items }) => items);
|
|
}
|
|
|
|
export class CiTestSequencer extends BaseSequencer {
|
|
override async shard(
|
|
files: TestSpecification[],
|
|
): Promise<TestSpecification[]> {
|
|
const historyPath = process.env.REA_CI_TEST_HISTORY;
|
|
const shard = this.ctx.config.shard;
|
|
if (!historyPath || !shard) return super.shard(files);
|
|
const root = this.ctx.config.root;
|
|
const recorded = await readTestDurations(historyPath, root);
|
|
if (!recorded) return super.shard(files);
|
|
const durations = seedSplitLoaderDurations(recorded);
|
|
|
|
const weighted = files.map((item) => {
|
|
const path = relative(root, resolve(root, item.moduleId))
|
|
.split(sep)
|
|
.join("/");
|
|
const projectWorkers = item.project.config.maxWorkers;
|
|
const laneWidth =
|
|
typeof projectWorkers === "number" &&
|
|
Number.isInteger(projectWorkers) &&
|
|
projectWorkers >= 1
|
|
? projectWorkers
|
|
: 1;
|
|
return {
|
|
item,
|
|
key: path + "\0" + item.project.name + "\0" + item.pool,
|
|
duration: durations.get(path),
|
|
laneWidth,
|
|
groupOrder: item.project.config.sequence.groupOrder,
|
|
};
|
|
});
|
|
const shards = allocateByDuration(weighted, shard.count);
|
|
return shards ? shards[shard.index - 1]! : super.shard(files);
|
|
}
|
|
}
|