Backup prebuild logs even it's fail (#19808)

* Backup prebuild workspace even it's fail

* skip backup content if headless task failed

Author: iQQBot

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

@@ -298,9 +298,10 @@ func (wsc *WorkspaceController) handleWorkspaceStop(ctx context.Context, ws *wor
 			WorkspaceID: ws.Spec.Ownership.WorkspaceID,
 			InstanceID:  ws.Name,
 		},
-		SnapshotName:    snapshotName,
-		BackupLogs:      ws.Spec.Type == workspacev1.WorkspaceTypePrebuild,
-		UpdateGitStatus: ws.Spec.Type == workspacev1.WorkspaceTypeRegular,
+		SnapshotName:      snapshotName,
+		BackupLogs:        ws.Spec.Type == workspacev1.WorkspaceTypePrebuild,
+		UpdateGitStatus:   ws.Spec.Type == workspacev1.WorkspaceTypeRegular,
+		SkipBackupContent: ws.Spec.Type == workspacev1.WorkspaceTypePrebuild && ws.IsConditionTrue(workspacev1.WorkspaceConditionsHeadlessTaskFailed),
 	})
 
 	err = retry.RetryOnConflict(retryParams, func() error {

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

@@ -97,10 +97,11 @@ type InitOptions struct {
 }
 
 type BackupOptions struct {
-	Meta            WorkspaceMeta
-	BackupLogs      bool
-	UpdateGitStatus bool
-	SnapshotName    string
+	Meta              WorkspaceMeta
+	BackupLogs        bool
+	UpdateGitStatus   bool
+	SnapshotName      string
+	SkipBackupContent bool
 }
 
 func NewWorkspaceOperations(config content.Config, provider *WorkspaceProvider, reg prometheus.Registerer) (WorkspaceOperations, error) {
@@ -237,6 +238,10 @@ func (wso *DefaultWorkspaceOperations) BackupWorkspace(ctx context.Context, opts
 		}
 	}
 
+	if opts.SkipBackupContent {
+		return nil, nil
+	}
+
 	err = wso.uploadWorkspaceContent(ctx, ws, opts.SnapshotName)
 	if err != nil {
 		glog.WithError(err).WithFields(ws.OWI()).Error("final backup failed for workspace")

components/ws-manager-mk2/controllers/status.go

@@ -276,9 +276,7 @@ func isDisposalFinished(ws *workspacev1.Workspace) bool {
 		// Can't dispose if node disappeared.
 		ws.IsConditionTrue(workspacev1.WorkspaceConditionNodeDisappeared) ||
 		// Image builds have nothing to dispose.
-		ws.Spec.Type == workspacev1.WorkspaceTypeImageBuild ||
-		// headless workspaces that failed do not need to be backed up
-		ws.IsConditionTrue(workspacev1.WorkspaceConditionsHeadlessTaskFailed)
+		ws.Spec.Type == workspacev1.WorkspaceTypeImageBuild
 }
 
 // extractFailure returns a pod failure reason and possibly a phase. If phase is nil then