aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2025-12-26 04:24:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'sim/aws: fix sim timeout handling' from Jussi Saurio

Browse Source 
code was trying to consume the same readablestream twice: once in the
timeouter's catch block, and a second time in the body of the try block
before postGithubIssue() could run.

Closes #1658
This commit is contained in:
Jussi Saurio
2025-06-04 09:38:31 +03:00
parent ad8c9a4c15 4fc04c8db3
commit 2d638e737c
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
simulator-docker-runner/docker-entrypoint.simulator.ts
View File

@@ -77,28 +77,9 @@ const run = async (seed: string, bin: string, args: string[]) => {
});
const timeout = timeouter(PER_RUN_TIMEOUT_SECONDS, runNumber);
timeout.catch(async (err) => {
if (err instanceof TimeoutError) {
console.log(`Timeout on seed ${seed}, exiting...`);
proc.kill();
const stdout = await new Response(proc.stdout).text();
const stderr = await new Response(proc.stderr).text();
const output = stdout + '\n' + stderr;
const seedForGithubIssue = seed;
const lastLines = output.split('\n').slice(-100).join('\n');
console.log(`Simulator seed: ${seedForGithubIssue}`);
await github.postGitHubIssue({
type: "timeout",
seed: seedForGithubIssue,
command: args.join(" "),
output: lastLines,
});
process.exit(0);
}
});
try {
const exitCode = await proc.exited;
const exitCode = await Promise.race([proc.exited, timeout]);
const stdout = await new Response(proc.stdout).text();
const stderr = await new Response(proc.stderr).text();
@@ -138,7 +119,24 @@ const run = async (seed: string, bin: string, args: string[]) => {
}
}
} catch (err) {
throw err;
if (err instanceof TimeoutError) {
console.log(`Timeout on seed ${seed}, posting to Github...`);
proc.kill();
const stdout = await new Response(proc.stdout).text();
const stderr = await new Response(proc.stderr).text();
const output = stdout + '\n' + stderr;
const seedForGithubIssue = seed;
const lastLines = output.split('\n').slice(-100).join('\n');
console.log(`Simulator seed: ${seedForGithubIssue}`);
await github.postGitHubIssue({
type: "timeout",
seed: seedForGithubIssue,
command: args.join(" "),
output: lastLines,
});
} else {
throw err;
}
} finally {
// @ts-ignore
timeout.clear();