Revert "Add annotation gitpod.io/startedDisposal once we enter finalize workspace content"

This reverts commit e40e43d.

Signed-off-by: JenTing Hsiao <[email protected]>

Author: jenting

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

@@ -984,12 +984,6 @@ func (m *Monitor) finalizeWorkspaceContent(ctx context.Context, wso *workspaceOb
 		return
 	}
 
-	err := m.manager.markWorkspace(ctx, workspaceID, addMark(startedDisposalAnnotation, util.BooleanTrueString))
-	if err != nil {
-		tracing.LogError(span, err)
-		log.WithError(err).Error("was unable to update pod's start disposal state - this might cause an incorrect disposal state")
-	}
-
 	var disposalStatus *workspaceDisposalStatus
 	defer func() {
 		if disposalStatus == nil {
@@ -1096,6 +1090,12 @@ func (m *Monitor) finalizeWorkspaceContent(ctx context.Context, wso *workspaceOb
 			cancelReq()
 		}()
 
+		err = m.manager.markWorkspace(ctx, workspaceID, addMark(startedDisposalAnnotation, util.BooleanTrueString))
+		if err != nil {
+			tracing.LogError(span, err)
+			log.WithError(err).Error("was unable to update pod's start disposal state - this might cause an incorrect disposal state")
+		}
+
 		if pvcFeatureEnabled {
 			// pvc was created with the name of the pod. see createDefiniteWorkspacePod()
 			pvcName := wso.Pod.Name