extract lib in caching flow
parent
5c64dd1ea0
commit
f29a3cac01
|
@ -5706,7 +5706,7 @@ class SharedWorkspaceLocking {
|
|||
}
|
||||
return (yield SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`))
|
||||
.map((x) => x.replace(`/`, ``))
|
||||
.filter((x) => x.includes(`${workspace}_lock`));
|
||||
.filter((x) => x.includes(`${workspace}_workspace_lock`));
|
||||
});
|
||||
}
|
||||
static GetOrCreateLockedWorkspace(workspace, runId, buildParametersContext) {
|
||||
|
@ -5829,7 +5829,7 @@ class SharedWorkspaceLocking {
|
|||
throw new Error(`Workspace file doesn't exist`);
|
||||
}
|
||||
const lockFilesExist = files.filter((x) => {
|
||||
return x.includes(`${workspace}_lock`);
|
||||
return x.includes(`${workspace}_workspace_lock`);
|
||||
}).length > 0;
|
||||
return lockFilesExist;
|
||||
});
|
||||
|
@ -5865,7 +5865,7 @@ class SharedWorkspaceLocking {
|
|||
}
|
||||
static ReleaseWorkspace(workspace, runId, buildParametersContext) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
const file = (yield SharedWorkspaceLocking.GetAllLocks(workspace, buildParametersContext)).filter((x) => x.includes(`_${runId}_${workspace}_lock`));
|
||||
const file = (yield SharedWorkspaceLocking.GetAllLocks(workspace, buildParametersContext)).filter((x) => x.includes(`_${runId}_${workspace}_workspace_lock`));
|
||||
cloud_runner_logger_1.default.log(`Deleting lock ${workspace}/${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);
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -40,7 +40,7 @@ export class SharedWorkspaceLocking {
|
|||
)
|
||||
)
|
||||
.map((x) => x.replace(`/`, ``))
|
||||
.filter((x) => x.includes(`${workspace}_lock`));
|
||||
.filter((x) => x.includes(`${workspace}_workspace_lock`));
|
||||
}
|
||||
public static async GetOrCreateLockedWorkspace(
|
||||
workspace: string,
|
||||
|
@ -202,7 +202,7 @@ export class SharedWorkspaceLocking {
|
|||
|
||||
const lockFilesExist =
|
||||
files.filter((x) => {
|
||||
return x.includes(`${workspace}_lock`);
|
||||
return x.includes(`${workspace}_workspace_lock`);
|
||||
}).length > 0;
|
||||
|
||||
return lockFilesExist;
|
||||
|
@ -262,7 +262,7 @@ export class SharedWorkspaceLocking {
|
|||
buildParametersContext: BuildParameters,
|
||||
): Promise<boolean> {
|
||||
const file = (await SharedWorkspaceLocking.GetAllLocks(workspace, buildParametersContext)).filter((x) =>
|
||||
x.includes(`_${runId}_${workspace}_lock`),
|
||||
x.includes(`_${runId}_${workspace}_workspace_lock`),
|
||||
);
|
||||
CloudRunnerLogger.log(`Deleting lock ${workspace}/${file}`);
|
||||
CloudRunnerLogger.log(`rm ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${file}`);
|
||||
|
|
Loading…
Reference in New Issue