mirrors/pikasTech-unidesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: patch follower timing atomically

Browse Source
This commit is contained in:
Codex
2026-07-03 17:32:12 +00:00
parent 72f6a7a0e4
commit babcb7b364
3 changed files with 116 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/src/cicd.ts
+8 -100
View File
@@ -2399,114 +2399,22 @@ function roundSeconds(value: number): number {
}
function writeFollowerState(registry: BranchFollowerRegistry, state: FollowerState, options: ParsedOptions): CommandResult {
const stateForWrite = preserveWriteTimeTotalTiming(registry, state, options);
const json = JSON.stringify(compactFollowerStateForConfigMap(stateForWrite));
const dataPatch = JSON.stringify({ data: { [state.id]: json, _updatedAt: new Date().toISOString(), _specRef: SPEC_REF } });
if (options.inCluster) {
const patchBase64 = Buffer.from(dataPatch, "utf8").toString("base64");
const createBase64 = Buffer.from(JSON.stringify({
metadata: {
name: registry.controller.stateConfigMapName,
namespace: registry.controller.namespace,
},
data: {
_createdAt: new Date().toISOString(),
_specRef: SPEC_REF,
},
}), "utf8").toString("base64");
const script = [
"set -eu",
`PATCH_B64=${shQuote(patchBase64)}`,
`CREATE_B64=${shQuote(createBase64)}`,
`NAMESPACE=${shQuote(registry.controller.namespace)}`,
`CONFIGMAP=${shQuote(registry.controller.stateConfigMapName)}`,
"export PATCH_B64 CREATE_B64 NAMESPACE CONFIGMAP",
"node <<'NODE_KUBE_PATCH'",
"import { readFileSync } from 'node:fs';",
"import https from 'node:https';",
"const host = process.env.KUBERNETES_SERVICE_HOST;",
"const port = Number(process.env.KUBERNETES_SERVICE_PORT || '443');",
"const namespace = process.env.NAMESPACE;",
"const name = process.env.CONFIGMAP;",
"const token = readFileSync('/var/run/secrets/kubernetes.io/serviceaccount/token', 'utf8').trim();",
"const ca = readFileSync('/var/run/secrets/kubernetes.io/serviceaccount/ca.crt');",
"const patch = Buffer.from(process.env.PATCH_B64 || '', 'base64').toString('utf8');",
"const create = Buffer.from(process.env.CREATE_B64 || '', 'base64').toString('utf8');",
"function request(method, path, body, contentType) {",
" return new Promise((resolve, reject) => {",
" const req = https.request({ host, port, path, method, ca, headers: { authorization: `Bearer ${token}`, ...(body ? { 'content-type': contentType || 'application/json', 'content-length': Buffer.byteLength(body) } : {}) } }, (res) => {",
" let text = '';",
" res.setEncoding('utf8');",
" res.on('data', (chunk) => { text += chunk; });",
" res.on('end', () => resolve({ status: res.statusCode || 0, text }));",
" });",
" req.on('error', reject);",
" if (body) req.write(body);",
" req.end();",
" });",
"}",
"const base = `/api/v1/namespaces/${namespace}/configmaps`;",
"let result = await request('PATCH', `${base}/${name}`, patch, 'application/merge-patch+json');",
"if (result.status === 404) {",
" const created = await request('POST', base, create, 'application/json');",
" if (created.status < 200 || created.status >= 300) { process.stderr.write(created.text); process.exit(1); }",
" result = await request('PATCH', `${base}/${name}`, patch, 'application/merge-patch+json');",
"}",
"if (result.status < 200 || result.status >= 300) { process.stderr.write(result.text); process.exit(1); }",
"NODE_KUBE_PATCH",
].join("\n");
return runKubeScript(registry, options, script, "", 10_000);
}
const script = [
"set -eu",
`kubectl -n ${shQuote(registry.controller.namespace)} create configmap ${shQuote(registry.controller.stateConfigMapName)} --from-literal=_createdAt="$(date -Iseconds)" --dry-run=client -o yaml | kubectl apply -f - >/dev/null`,
`kubectl -n ${shQuote(registry.controller.namespace)} patch configmap ${shQuote(registry.controller.stateConfigMapName)} --type merge -p ${shQuote(dataPatch)} >/dev/null`,
].join("\n");
return runKubeScript(registry, options, script, "", 10_000);
}
function preserveWriteTimeTotalTiming(registry: BranchFollowerRegistry, state: FollowerState, options: ParsedOptions): FollowerState {
if (state.timings.totalSeconds !== null) return state;
const existing = readExistingFollowerStateForWrite(registry, state.id, options);
const existingTimings = asOptionalRecord(existing?.timings);
if (existingTimings === null) return state;
const sourceCommit = stringOrNull(existingTimings.sourceCommit);
if (sourceCommit === null || sourceCommit !== state.source.observedSha) return state;
const startedAt = stringOrNull(existingTimings.startedAt);
const existingFinishedAt = stringOrNull(existingTimings.finishedAt);
const finishedAt = existingFinishedAt ?? (terminalPhase(state.phase) ? new Date().toISOString() : null);
const seconds = totalSecondsFromRange(startedAt, finishedAt) ?? numberOrNull(existingTimings.totalSeconds);
if (seconds === null) return state;
return {
...state,
timings: {
...state.timings,
totalSeconds: seconds,
totalStatus: terminalPhase(state.phase) ? "completed" : state.phase.toLowerCase(),
totalSource: stringOrNull(existingTimings.totalSource) ?? "stored-state",
sourceCommit,
startedAt,
finishedAt,
overBudget: seconds > state.timings.budgetSeconds,
},
};
}
function readExistingFollowerStateForWrite(registry: BranchFollowerRegistry, followerId: string, options: ParsedOptions): Record<string, unknown> | null {
const stateJson = JSON.stringify(compactFollowerStateForConfigMap(state));
const script = [
"set -eu",
`NAMESPACE=${shQuote(registry.controller.namespace)}`,
`CONFIGMAP=${shQuote(registry.controller.stateConfigMapName)}`,
`FOLLOWER_ID=${shQuote(followerId)}`,
"export NAMESPACE CONFIGMAP FOLLOWER_ID",
`FOLLOWER_ID=${shQuote(state.id)}`,
`SPEC_REF=${shQuote(SPEC_REF)}`,
`STATE_B64=${shQuote(Buffer.from(stateJson, "utf8").toString("base64"))}`,
"export NAMESPACE CONFIGMAP FOLLOWER_ID SPEC_REF STATE_B64",
"tmpdir=$(mktemp -d)",
"cleanup() { rm -rf \"$tmpdir\"; }",
"trap cleanup EXIT INT TERM",
nativeCicdScriptLoadShell(["read-follower-state.mjs"]),
"node \"$tmpdir/read-follower-state.mjs\"",
nativeCicdScriptLoadShell(["patch-follower-state.mjs"]),
"node \"$tmpdir/patch-follower-state.mjs\"",
].join("\n");
const result = runKubeScript(registry, options, script, "", 10_000);
return result.exitCode === 0 ? parseJsonObject(result.stdout) : null;
return runKubeScript(registry, options, script, "", 10_000);
}
function runControllerReconcileJob(registry: BranchFollowerRegistry, options: ParsedOptions, mode: { dryRun: boolean; wait: boolean; recordState: boolean }): Record<string, unknown> {