diff --git a/components/server/src/workspace/workspace-start-controller.ts b/components/server/src/workspace/workspace-start-controller.ts index 7f760337f406f6..9c943018e7a742 100644 --- a/components/server/src/workspace/workspace-start-controller.ts +++ b/components/server/src/workspace/workspace-start-controller.ts @@ -10,7 +10,6 @@ import { Job } from "../jobs/runner"; import { DBWithTracing, TracedWorkspaceDB, UserDB, WorkspaceDB } from "@gitpod/gitpod-db/lib"; import { durationLongerThanSeconds } from "@gitpod/gitpod-protocol/lib/util/timeutil"; import { WorkspaceStarter } from "./workspace-starter"; -import { getExperimentsClientForBackend } from "@gitpod/gitpod-protocol/lib/experiments/configcat-server"; import { log } from "@gitpod/gitpod-protocol/lib/util/logging"; @injectable() @@ -53,18 +52,6 @@ export class WorkspaceStartController implements Job { throw new Error("cannot find owner for workspace"); } - const isEnabled = await getExperimentsClientForBackend().getValueAsync( - "workspace_start_controller", - false, - { - user, - projectId: workspace.projectId, - }, - ); - if (!isEnabled) { - continue; - } - await this.workspaceStarter.reconcileWorkspaceStart(ctx, instance.id, user, workspace); } } catch (err) { diff --git a/components/server/src/workspace/workspace-starter.ts b/components/server/src/workspace/workspace-starter.ts index a1d678fd0808e3..935f6b79a847f9 100644 --- a/components/server/src/workspace/workspace-starter.ts +++ b/components/server/src/workspace/workspace-starter.ts @@ -129,7 +129,6 @@ import { WorkspaceClassesConfig } from "./workspace-classes"; import { SYSTEM_USER } from "../authorization/authorizer"; import { EnvVarService, ResolvedEnvVars } from "../user/env-var-service"; import { RedlockAbortSignal } from "redlock"; -import { getExperimentsClientForBackend } from "@gitpod/gitpod-protocol/lib/experiments/configcat-server"; import { ConfigProvider } from "./config-provider"; import { isGrpcError } from "@gitpod/gitpod-protocol/lib/util/grpc"; @@ -382,17 +381,6 @@ export class WorkspaceStarter { } }; - const runWithMutex = await getExperimentsClientForBackend().getValueAsync("workspace_start_controller", false, { - user, - projectId: workspace.projectId, - }); - ctx.span.setTag("runWithMutex", runWithMutex); - if (!runWithMutex) { - const abortController = new AbortController(); - await doReconcileWorkspaceStart(abortController.signal); - return; - } - // We try to acquire a mutex here, which we intend to hold until the workspace start request is sent to ws-manager. // In case this container dies for whatever reason, the mutex is eventually released, and the instance can be picked up // by another server process (cmp. WorkspaceStartController).