Remove the duplicate check logic

Signed-off-by: JenTing Hsiao <[email protected]>
gitpod-io · Oct 14, 2022 · 5702992 · 5702992
1 parent a8afac7
commit 5702992
Showing 1 changed file with 12 additions and 50 deletions.
diff --git a/components/ws-manager/pkg/manager/monitor.go b/components/ws-manager/pkg/manager/monitor.go
@@ -1070,22 +1070,20 @@ func (m *Monitor) finalizeWorkspaceContent(ctx context.Context, wso *workspaceOb
 			return &csapi.GitStatus{}, nil
 		}
 
-		if pvcFeatureEnabled {
-			// only set status to started if we actually confirmed that workspace is ready and we are about to do actual disposal
-			// otherwise we risk overwriting previous disposal status
-			if !markedDisposalStatusStarted {
-				statusStarted := &workspaceDisposalStatus{
-					Status: DisposalStarted,
-				}
-				err = m.manager.markDisposalStatus(ctx, workspaceID, statusStarted)
-				if err != nil {
-					tracing.LogError(span, err)
-					log.WithError(err).Error("was unable to update pod's start disposal status - this might cause an incorrect disposal status")
-				} else {
-					markedDisposalStatusStarted = true
-				}
+		if !markedDisposalStatusStarted {
+			statusStarted := &workspaceDisposalStatus{
+				Status: DisposalStarted,
 			}
+			err = m.manager.markDisposalStatus(ctx, workspaceID, statusStarted)
+			if err != nil {
+				tracing.LogError(span, err)
+				log.WithError(err).Error("was unable to update pod's start disposal status - this might cause an incorrect disposal status")
+			} else {
+				markedDisposalStatusStarted = true
+			}
+		}
 
+		if pvcFeatureEnabled {
 			// pvc was created with the name of the pod. see createDefiniteWorkspacePod()
 			pvcName := wso.Pod.Name
 			if !createdVolumeSnapshot {
@@ -1241,48 +1239,12 @@ func (m *Monitor) finalizeWorkspaceContent(ctx context.Context, wso *workspaceOb
 				deletedPVC = true
 			}
 		} else if doSnapshot {
-			// we're not yet finalizing - start the process
 			snc, err = m.manager.connectToWorkspaceDaemon(ctx, *wso)
 			if err != nil {
 				tracing.LogError(span, err)
 				return nil, status.Errorf(codes.Unavailable, "cannot connect to workspace daemon: %q", err)
 			}
 
-			var workspaceExistsResult *wsdaemon.IsWorkspaceExistsResponse
-			workspaceExistsResult, err = snc.IsWorkspaceExists(ctx, &wsdaemon.IsWorkspaceExistsRequest{Id: workspaceID})
-			if err != nil {
-				tracing.LogError(span, err)
-				return nil, err
-			}
-			if !workspaceExistsResult.Exists {
-				// nothing to backup, workspace does not exist
-				return nil, status.Error(codes.NotFound, "workspace does not exist")
-			}
-
-			// make sure that workspace was ready, otherwise there is no need to backup anything
-			// as we might backup corrupted workspace state
-			// this also ensures that if INITIALIZING still going, that we will wait for it to finish before disposing the workspace
-			_, err = snc.WaitForInit(ctx, &wsdaemon.WaitForInitRequest{Id: workspaceID})
-			if err != nil {
-				tracing.LogError(span, err)
-				return nil, err
-			}
-
-			// only set status to started if we actually confirmed that workspace is ready and we are about to do actual disposal
-			// otherwise we risk overwriting previous disposal status
-			if !markedDisposalStatusStarted {
-				statusStarted := &workspaceDisposalStatus{
-					Status: DisposalStarted,
-				}
-				err = m.manager.markDisposalStatus(ctx, workspaceID, statusStarted)
-				if err != nil {
-					tracing.LogError(span, err)
-					log.WithError(err).Error("was unable to update pod's start disposal status - this might cause an incorrect disposal status")
-				} else {
-					markedDisposalStatusStarted = true
-				}
-			}
-
 			// if this is a prebuild take a snapshot and mark the workspace
 			var res *wsdaemon.TakeSnapshotResponse
 			res, err = snc.TakeSnapshot(ctx, &wsdaemon.TakeSnapshotRequest{Id: workspaceID})