locking test improvements
parent
63547bed70
commit
84abe3259d
|
@ -5872,16 +5872,16 @@ class SharedWorkspaceLocking {
|
||||||
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);
|
||||||
cloud_runner_logger_1.default.log(`Release Lock ${!SharedWorkspaceLocking.HasWorkspaceLock(workspace, runId, buildParametersContext)}`);
|
cloud_runner_logger_1.default.log(`!Has Lock ${!(yield SharedWorkspaceLocking.HasWorkspaceLock(workspace, runId, buildParametersContext))}`);
|
||||||
cloud_runner_logger_1.default.log(`Release Lock ${(yield SharedWorkspaceLocking.GetAllLocks(workspace, buildParametersContext))
|
cloud_runner_logger_1.default.log(`All Lock ${JSON.stringify((yield SharedWorkspaceLocking.GetAllLocks(workspace, buildParametersContext))
|
||||||
.map((x) => {
|
.map((x) => {
|
||||||
return {
|
return {
|
||||||
name: x,
|
name: x,
|
||||||
timestamp: Number(x.split(`_`)[0]),
|
timestamp: Number(x.split(`_`)[0]),
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
.sort((x) => x.timestamp)}`);
|
.sort((x) => x.timestamp), undefined, 4)}`);
|
||||||
return !SharedWorkspaceLocking.HasWorkspaceLock(workspace, runId, buildParametersContext);
|
return !(yield SharedWorkspaceLocking.HasWorkspaceLock(workspace, runId, buildParametersContext));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
static CleanupWorkspace(workspace, buildParametersContext) {
|
static CleanupWorkspace(workspace, buildParametersContext) {
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -276,20 +276,24 @@ export class SharedWorkspaceLocking {
|
||||||
true,
|
true,
|
||||||
);
|
);
|
||||||
CloudRunnerLogger.log(
|
CloudRunnerLogger.log(
|
||||||
`Release Lock ${!SharedWorkspaceLocking.HasWorkspaceLock(workspace, runId, buildParametersContext)}`,
|
`!Has Lock ${!(await SharedWorkspaceLocking.HasWorkspaceLock(workspace, runId, buildParametersContext))}`,
|
||||||
);
|
);
|
||||||
CloudRunnerLogger.log(
|
CloudRunnerLogger.log(
|
||||||
`Release Lock ${(await SharedWorkspaceLocking.GetAllLocks(workspace, buildParametersContext))
|
`All Lock ${JSON.stringify(
|
||||||
.map((x) => {
|
(await SharedWorkspaceLocking.GetAllLocks(workspace, buildParametersContext))
|
||||||
return {
|
.map((x) => {
|
||||||
name: x,
|
return {
|
||||||
timestamp: Number(x.split(`_`)[0]),
|
name: x,
|
||||||
};
|
timestamp: Number(x.split(`_`)[0]),
|
||||||
})
|
};
|
||||||
.sort((x) => x.timestamp)}`,
|
})
|
||||||
|
.sort((x) => x.timestamp),
|
||||||
|
undefined,
|
||||||
|
4,
|
||||||
|
)}`,
|
||||||
);
|
);
|
||||||
|
|
||||||
return !SharedWorkspaceLocking.HasWorkspaceLock(workspace, runId, buildParametersContext);
|
return !(await SharedWorkspaceLocking.HasWorkspaceLock(workspace, runId, buildParametersContext));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static async CleanupWorkspace(workspace: string, buildParametersContext: BuildParameters) {
|
public static async CleanupWorkspace(workspace: string, buildParametersContext: BuildParameters) {
|
||||||
|
|
Loading…
Reference in New Issue