(wsman-mk2] Prevent partial backups (#16997)

Author: Furisto

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

@@ -269,7 +269,7 @@ func (wsc *WorkspaceController) handleWorkspaceStop(ctx context.Context, ws *wor
 		}
 	}
 
-	gitStatus, disposeErr := wsc.operations.DisposeWorkspace(ctx, DisposeOptions{
+	gitStatus, disposeErr := wsc.operations.BackupWorkspace(ctx, DisposeOptions{
 		Meta: WorkspaceMeta{
 			Owner:       ws.Spec.Ownership.Owner,
 			WorkspaceId: ws.Spec.Ownership.WorkspaceID,
@@ -289,7 +289,7 @@ func (wsc *WorkspaceController) handleWorkspaceStop(ctx context.Context, ws *wor
 		ws.Status.GitStatus = toWorkspaceGitStatus(gitStatus)
 
 		if disposeErr != nil {
-			log.Error(disposeErr, "failed to dispose workspace", "name", ws.Name)
+			log.Error(disposeErr, "failed to backup workspace", "name", ws.Name)
 			ws.Status.SetCondition(workspacev1.NewWorkspaceConditionBackupFailure(disposeErr.Error()))
 		} else {
 			ws.Status.SetCondition(workspacev1.NewWorkspaceConditionBackupComplete())
@@ -302,7 +302,14 @@ func (wsc *WorkspaceController) handleWorkspaceStop(ctx context.Context, ws *wor
 		wsc.metrics.recordFinalizeTime(time.Since(disposeStart).Seconds(), ws)
 	}
 
-	wsc.emitEvent(ws, "Backup", disposeErr)
+	wsc.emitEvent(ws, "Backup", fmt.Errorf("failed to backup workspace: %w", disposeErr))
+
+	err = wsc.operations.DeleteWorkspace(ctx, ws.Name)
+	if err != nil {
+		wsc.emitEvent(ws, "Backup", fmt.Errorf("failed to clean up workspace: %w", err))
+		return ctrl.Result{}, err
+	}
+
 	return ctrl.Result{}, err
 }
 

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

@@ -171,7 +171,7 @@ func (wso *WorkspaceOperations) creator(owner, workspaceId, instanceId string, i
 	}
 }
 
-func (wso *WorkspaceOperations) DisposeWorkspace(ctx context.Context, opts DisposeOptions) (*csapi.GitStatus, error) {
+func (wso *WorkspaceOperations) BackupWorkspace(ctx context.Context, opts DisposeOptions) (*csapi.GitStatus, error) {
 	ws, err := wso.provider.Get(ctx, opts.Meta.InstanceId)
 	if err != nil {
 		return nil, fmt.Errorf("cannot find workspace %s during DisposeWorkspace: %w", opts.Meta.InstanceId, err)
@@ -207,16 +207,27 @@ func (wso *WorkspaceOperations) DisposeWorkspace(ctx context.Context, opts Dispo
 		}
 	}
 
+	return repo, nil
+}
+
+func (wso *WorkspaceOperations) DeleteWorkspace(ctx context.Context, instanceID string) error {
+	ws, err := wso.provider.Get(ctx, instanceID)
+	if err != nil {
+		return fmt.Errorf("cannot find workspace %s during DisposeWorkspace: %w", instanceID, err)
+	}
+
 	if err = ws.Dispose(ctx, wso.provider.hooks[session.WorkspaceDisposed]); err != nil {
 		glog.WithError(err).Error("cannot dispose session")
+		return err
 	}
 
 	// remove workspace daemon directory in the node
 	if err := os.RemoveAll(ws.ServiceLocDaemon); err != nil {
 		glog.WithError(err).Error("cannot delete workspace daemon directory")
+		return err
 	}
 
-	return repo, nil
+	return nil
 }
 
 func (wso *WorkspaceOperations) SnapshotIDs(ctx context.Context, workspaceID string) (snapshotUrl, snapshotName string, err error) {