1

Author: iQQBot

components/ws-daemon/pkg/controller/workspace_controller.go

@@ -363,7 +363,7 @@ func (wsc *WorkspaceController) doWorkspaceContentBackup(ctx context.Context, sp
 		if !ws.IsConditionTrue(workspacev1.WorkspaceConditionForceKilledTask) {
 			err = wsc.forceKillContainerTask(ctx, ws)
 			if err != nil {
-				return ctrl.Result{}, fmt.Errorf("failed to force kill container task: %w", err)
+				glog.WithFields(ws.OWI()).WithField("workspace", req.NamespacedName).Errorf("failed to force kill task: %v", err)
 			}
 			err = retry.RetryOnConflict(retryParams, func() error {
 				if err := wsc.Get(ctx, req.NamespacedName, ws); err != nil {
@@ -378,6 +378,10 @@ func (wsc *WorkspaceController) doWorkspaceContentBackup(ctx context.Context, sp
 			return ctrl.Result{Requeue: true, RequeueAfter: 2 * time.Second}, nil
 		}
 
+		if time.Since(wsk8s.GetCondition(ws.Status.Conditions, string(workspacev1.WorkspaceConditionForceKilledTask)).LastTransitionTime.Time) < 2*time.Second {
+			return ctrl.Result{Requeue: true, RequeueAfter: 2 * time.Second}, nil
+		}
+
 		glog.WithFields(ws.OWI()).WithField("workspace", req.NamespacedName).Warn("workspace container is still running after 5 minutes of deletion, starting backup anyway")
 		err = wsc.dumpWorkspaceContainerInfo(ctx, ws)
 		if err != nil {