locking 2nd time
parent
d255cf4375
commit
520bc3d1e7
|
@ -5729,12 +5729,14 @@ class SharedWorkspaceLocking {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (_a) {
|
catch (error) {
|
||||||
|
cloud_runner_logger_1.default.log(JSON.stringify(error, undefined, 4));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
const createResult = yield SharedWorkspaceLocking.CreateWorkspace(workspace, buildParametersContext, runId);
|
const createResult = yield SharedWorkspaceLocking.CreateWorkspace(workspace, buildParametersContext, runId);
|
||||||
cloud_runner_logger_1.default.log(`run agent ${runId} didn't find a free workspace so created: ${workspace} createWorkspaceSuccess: ${createResult}`);
|
const lockResult = yield SharedWorkspaceLocking.LockWorkspace(workspace, runId, buildParametersContext);
|
||||||
return createResult;
|
cloud_runner_logger_1.default.log(`run agent ${runId} didn't find a free workspace so created: ${workspace} createWorkspaceSuccess: ${createResult && lockResult}`);
|
||||||
|
return createResult && lockResult;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
static DoesWorkspaceExist(workspace, buildParametersContext) {
|
static DoesWorkspaceExist(workspace, buildParametersContext) {
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -69,16 +69,21 @@ export class SharedWorkspaceLocking {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch {
|
} catch (error) {
|
||||||
|
CloudRunnerLogger.log(JSON.stringify(error, undefined, 4));
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
const createResult = await SharedWorkspaceLocking.CreateWorkspace(workspace, buildParametersContext, runId);
|
const createResult = await SharedWorkspaceLocking.CreateWorkspace(workspace, buildParametersContext, runId);
|
||||||
|
const lockResult = await SharedWorkspaceLocking.LockWorkspace(workspace, runId, buildParametersContext);
|
||||||
CloudRunnerLogger.log(
|
CloudRunnerLogger.log(
|
||||||
`run agent ${runId} didn't find a free workspace so created: ${workspace} createWorkspaceSuccess: ${createResult}`,
|
`run agent ${runId} didn't find a free workspace so created: ${workspace} createWorkspaceSuccess: ${
|
||||||
|
createResult && lockResult
|
||||||
|
}`,
|
||||||
);
|
);
|
||||||
|
|
||||||
return createResult;
|
return createResult && lockResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static async DoesWorkspaceExist(workspace: string, buildParametersContext: BuildParameters) {
|
public static async DoesWorkspaceExist(workspace: string, buildParametersContext: BuildParameters) {
|
||||||
|
|
Loading…
Reference in New Issue