two

Author: Laurie T. Malau

components/ws-manager-bridge/src/bridge.ts

@@ -456,7 +456,8 @@ export class WorkspaceManagerBridge implements Disposable {
                             ctx,
                             nonStoppedInstances,
                             clientProvider,
-                            this.config.timeouts.maxInstanceDuration,
+                            this.config.timeouts.pendingPhaseSeconds,
+                            this.config.timeouts.stoppingPhaseSeconds,
                         );
 
                         disconnectStarted = Number.MAX_SAFE_INTEGER; // Reset disconnect period
@@ -494,7 +495,8 @@ export class WorkspaceManagerBridge implements Disposable {
         parentCtx: TraceContext,
         runningInstances: RunningWorkspaceInfo[],
         clientProvider: ClientProvider,
-        maxInstanceDuration: number,
+        pendingPhaseSeconds: number,
+        stoppingPhaseSeconds: number,
     ) {
         const installation = this.config.installation;
 
@@ -521,10 +523,10 @@ export class WorkspaceManagerBridge implements Disposable {
                 // stopping states timeout is 1 hour after stoppingTime.
                 if (
                     (phase === "pending" &&
-                        durationLongerThanSeconds(Date.parse(instance.creationTime), maxInstanceDuration)) ||
+                        durationLongerThanSeconds(Date.parse(instance.creationTime), pendingPhaseSeconds)) ||
                     (phase === "stopping" &&
                         instance.stoppingTime &&
-                        durationLongerThanSeconds(Date.parse(instance.stoppingTime), maxInstanceDuration))
+                        durationLongerThanSeconds(Date.parse(instance.stoppingTime), stoppingPhaseSeconds))
                 ) {
                     log.info(
                         { instanceId, workspaceId: instance.workspaceId },

components/ws-manager-bridge/src/config.ts

@@ -31,7 +31,8 @@ export interface Configuration {
         preparingPhaseSeconds: number;
         buildingPhaseSeconds: number;
         unknownPhaseSeconds: number;
-        maxInstanceDuration: number;
+        pendingPhaseSeconds: number;
+        stoppingPhaseSeconds: number;
     };
 
     // emulatePreparingIntervalSeconds configures how often we check for Workspaces in phase "preparing" for clusters we do not govern

install/installer/cmd/testdata/render/aws-setup/output.golden

@@ -28,7 +28,8 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 			PreparingPhaseSeconds: 3600,
 			BuildingPhaseSeconds:  3600,
 			UnknownPhaseSeconds:   600,
-			MaxInstanceDuration:   3600,
+			PendingPhaseSeconds:   3600,
+			StoppingPhaseSeconds:  3600,
 		},
 		EmulatePreparingIntervalSeconds: 10,
 		StaticBridges:                   WSManagerList(ctx),

install/installer/cmd/testdata/render/azure-setup/output.golden

@@ -26,7 +26,8 @@ type Timeouts struct {
 	PreparingPhaseSeconds int32 `json:"preparingPhaseSeconds"`
 	BuildingPhaseSeconds  int32 `json:"buildingPhaseSeconds"`
 	UnknownPhaseSeconds   int32 `json:"unknownPhaseSeconds"`
-	MaxInstanceDuration   int32 `json:"maxInstanceDuration"`
+	PendingPhaseSeconds   int32 `json:"pendingPhaseSeconds"`
+	StoppingPhaseSeconds  int32 `json:"stoppingPhaseSeconds"`
 }
 
 // WorkspaceCluster from components/gitpod-protocol/src/workspace-cluster.ts