ws-manager: if disposal status is finished, don't run finalizer.

Author: utam0k

components/ws-manager/pkg/manager/annotations.go

@@ -177,11 +177,7 @@ func (m *Manager) markDisposalStatus(ctx context.Context, workspaceID string, di
 		return err
 	}
 
-	err = m.markWorkspace(ctx, workspaceID, addMark(disposalStatusAnnotation, string(b)))
-	if err != nil {
-		return err
-	}
-	return nil
+	return m.markWorkspace(ctx, workspaceID, addMark(disposalStatusAnnotation, string(b)))
 }
 
 type DisposalStatus string

components/ws-manager/pkg/manager/monitor.go

@@ -514,9 +514,11 @@ func actOnPodEvent(ctx context.Context, m actingManager, manager *Manager, statu
 				}
 				return m.modifyFinalizer(ctx, workspaceID, gitpodFinalizerName, false)
 			} else {
-				// We start finalizing the workspace content only after the container is gone. This way we ensure there's
-				// no process modifying the workspace content as we create the backup.
-				go m.finalizeWorkspaceContent(ctx, wso)
+				if ds == nil || ds.Status != DisposalFinished {
+					// We start finalizing the workspace content only after the container is gone. This way we ensure there's
+					// no process modifying the workspace content as we create the backup.
+					go m.finalizeWorkspaceContent(ctx, wso)
+				}
 			}
 		}