fix
parent
fdd143849b
commit
037eedc6cc
|
@ -5865,7 +5865,7 @@ class SharedWorkspaceLocking {
|
||||||
static IsWorkspaceLocked(workspace, buildParametersContext) {
|
static IsWorkspaceLocked(workspace, buildParametersContext) {
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
if (!(yield SharedWorkspaceLocking.DoesWorkspaceExist(workspace, buildParametersContext))) {
|
if (!(yield SharedWorkspaceLocking.DoesWorkspaceExist(workspace, buildParametersContext))) {
|
||||||
throw new Error(`workspace doesn't exist`);
|
throw new Error(`workspace doesn't exist ${workspace}`);
|
||||||
}
|
}
|
||||||
const files = yield SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`);
|
const files = yield SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`);
|
||||||
if (workspace.includes(`_`)) {
|
if (workspace.includes(`_`)) {
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -187,7 +187,7 @@ export class SharedWorkspaceLocking {
|
||||||
|
|
||||||
public static async IsWorkspaceLocked(workspace: string, buildParametersContext: BuildParameters): Promise<boolean> {
|
public static async IsWorkspaceLocked(workspace: string, buildParametersContext: BuildParameters): Promise<boolean> {
|
||||||
if (!(await SharedWorkspaceLocking.DoesWorkspaceExist(workspace, buildParametersContext))) {
|
if (!(await SharedWorkspaceLocking.DoesWorkspaceExist(workspace, buildParametersContext))) {
|
||||||
throw new Error(`workspace doesn't exist`);
|
throw new Error(`workspace doesn't exist ${workspace}`);
|
||||||
}
|
}
|
||||||
const files = await SharedWorkspaceLocking.ReadLines(
|
const files = await SharedWorkspaceLocking.ReadLines(
|
||||||
`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`,
|
`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`,
|
||||||
|
|
|
@ -232,6 +232,7 @@ describe('Cloud Runner Locking', () => {
|
||||||
const workspaces = await SharedWorkspaceLocking.GetAllWorkspaces(buildParameters);
|
const workspaces = await SharedWorkspaceLocking.GetAllWorkspaces(buildParameters);
|
||||||
for (let element of workspaces) {
|
for (let element of workspaces) {
|
||||||
element = `${element.split(`_`)[1]}_${element.split(`_`)[2]}`;
|
element = `${element.split(`_`)[1]}_${element.split(`_`)[2]}`;
|
||||||
|
expect(await SharedWorkspaceLocking.DoesWorkspaceExist(element, buildParameters)).toBeTruthy();
|
||||||
await new Promise((promise) => setTimeout(promise, 1500));
|
await new Promise((promise) => setTimeout(promise, 1500));
|
||||||
const isLocked = await SharedWorkspaceLocking.IsWorkspaceLocked(element, buildParameters);
|
const isLocked = await SharedWorkspaceLocking.IsWorkspaceLocked(element, buildParameters);
|
||||||
const isBelowMax = await SharedWorkspaceLocking.IsWorkspaceBelowMax(element, buildParameters);
|
const isBelowMax = await SharedWorkspaceLocking.IsWorkspaceBelowMax(element, buildParameters);
|
||||||
|
|
Loading…
Reference in New Issue