locking test improvements

pull/496/head
Frostebite 2023-02-13 21:02:08 +00:00
parent 894cc626c7
commit ccf83c2f22
3 changed files with 5 additions and 5 deletions

3
dist/index.js generated vendored
View File

@ -5866,7 +5866,8 @@ class SharedWorkspaceLocking {
} }
static ReleaseWorkspace(workspace, runId, buildParametersContext) { static ReleaseWorkspace(workspace, runId, buildParametersContext) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const file = (yield SharedWorkspaceLocking.GetAllLocks(workspace, buildParametersContext)).filter((x) => x.endsWith(`_${runId}_${workspace}_workspace_lock`)); const files = yield SharedWorkspaceLocking.GetAllLocks(workspace, buildParametersContext);
const file = files.find((x) => x.endsWith(`${workspace}_workspace_lock`) && x.includes(runId));
cloud_runner_logger_1.default.log(`Deleting lock ${workspace}/${file}`); cloud_runner_logger_1.default.log(`Deleting lock ${workspace}/${file}`);
cloud_runner_logger_1.default.log(`rm ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${file}`); cloud_runner_logger_1.default.log(`rm ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${file}`);
yield cloud_runner_system_1.CloudRunnerSystem.Run(`aws s3 rm ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${file}`, false, true); yield cloud_runner_system_1.CloudRunnerSystem.Run(`aws s3 rm ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${file}`, false, true);

2
dist/index.js.map generated vendored

File diff suppressed because one or more lines are too long

View File

@ -265,9 +265,8 @@ export class SharedWorkspaceLocking {
runId: string, runId: string,
buildParametersContext: BuildParameters, buildParametersContext: BuildParameters,
): Promise<boolean> { ): Promise<boolean> {
const file = (await SharedWorkspaceLocking.GetAllLocks(workspace, buildParametersContext)).filter((x) => const files = await SharedWorkspaceLocking.GetAllLocks(workspace, buildParametersContext);
x.endsWith(`_${runId}_${workspace}_workspace_lock`), const file = files.find((x) => x.endsWith(`${workspace}_workspace_lock`) && x.includes(runId));
);
CloudRunnerLogger.log(`Deleting lock ${workspace}/${file}`); CloudRunnerLogger.log(`Deleting lock ${workspace}/${file}`);
CloudRunnerLogger.log(`rm ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${file}`); CloudRunnerLogger.log(`rm ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${file}`);
await CloudRunnerSystem.Run( await CloudRunnerSystem.Run(