[ws-daemon] Increase WaitForContainer timeout

Author: aledbf

components/ws-daemon/pkg/container/containerd.go

@@ -306,6 +306,7 @@ func (s *Containerd) handleNewTask(cid string, rootfs []*types.Mount, pid uint32
 func (s *Containerd) WaitForContainer(ctx context.Context, workspaceInstanceID string) (cid ID, err error) {
 	//nolint:ineffassign
 	span, ctx := opentracing.StartSpanFromContext(ctx, "WaitForContainer")
+	span.LogKV("workspaceInstanceID", workspaceInstanceID)
 	defer tracing.FinishSpan(span, &err)
 
 	rchan := make(chan ID, 1)
@@ -348,6 +349,7 @@ func (s *Containerd) WaitForContainer(ctx context.Context, workspaceInstanceID s
 func (s *Containerd) WaitForContainerStop(ctx context.Context, workspaceInstanceID string) (err error) {
 	//nolint:ineffassign
 	span, ctx := opentracing.StartSpanFromContext(ctx, "WaitForContainerStop")
+	span.LogKV("workspaceInstanceID", workspaceInstanceID)
 	defer tracing.FinishSpan(span, &err)
 
 	rchan := make(chan struct{}, 1)

components/ws-daemon/pkg/dispatch/dispatch.go

@@ -199,7 +199,8 @@ func (d *Dispatch) handlePodUpdate(oldPod, newPod *corev1.Pod) {
 			},
 		}
 
-		waitForPodCtx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
+		// Important!!!!: ideally this timeout must be equal to ws-manager https://github.com/gitpod-io/gitpod/blob/main/components/ws-manager/pkg/manager/manager.go#L171
+		waitForPodCtx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
 		containerCtx, containerCtxCancel := context.WithCancel(context.Background())
 		containerCtx = context.WithValue(containerCtx, contextDispatch, d)
 		go func() {