[ws-manager] do not overwrite failed state

gitpod-io · Jul 15, 2022 · f55f6e6 · f55f6e6
1 parent 0945a99
commit f55f6e6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/components/ws-manager/pkg/manager/status.go b/components/ws-manager/pkg/manager/status.go
@@ -350,11 +350,7 @@ func (m *Manager) extractStatusFromPod(result *api.WorkspaceStatus, wso workspac
 		result.Phase = api.WorkspacePhase_STOPPING
 
 		_, podFailedBeforeBeingStopped := pod.Annotations[workspaceFailedBeforeStoppingAnnotation]
-		if !podFailedBeforeBeingStopped {
-			// While the pod is being deleted we do not care or want to know about any failure state.
-			// If the pod got stopped because it failed we will have sent out a Stopping status with a "failure"
-			result.Conditions.Failed = ""
-		} else {
+		if podFailedBeforeBeingStopped {
 			if _, ok := pod.Annotations[workspaceNeverReadyAnnotation]; ok {
 				// The workspace is never ready, so there is no need for a stopping phase.
 				result.Phase = api.WorkspacePhase_STOPPED

diff --git a/components/ws-manager/pkg/manager/testdata/status_containerd4214_STOPPING00.golden b/components/ws-manager/pkg/manager/testdata/status_containerd4214_STOPPING00.golden
@@ -20,6 +20,7 @@
         },
         "phase": 6,
         "conditions": {
+            "failed": "container workspace completed; containers of a workspace pod are not supposed to do that. Reason: ",
             "final_backup_complete": 1,
             "volume_snapshot": {}
         },

diff --git a/components/ws-manager/pkg/manager/testdata/status_disposal_STOPPED01.golden b/components/ws-manager/pkg/manager/testdata/status_disposal_STOPPED01.golden
@@ -20,7 +20,7 @@
         },
         "phase": 6,
         "conditions": {
-            "failed": "last backup failed: testing the backup failure mode.",
+            "failed": "ungraceful shutdown - teardown was unsuccessful: socket did not appear before context was canceled; last backup failed: testing the backup failure mode.",
             "final_backup_complete": 1,
             "volume_snapshot": {}
         },

diff --git a/components/ws-manager/pkg/manager/testdata/status_disposal_STOPPING02.golden b/components/ws-manager/pkg/manager/testdata/status_disposal_STOPPING02.golden
@@ -20,6 +20,7 @@
         },
         "phase": 6,
         "conditions": {
+            "failed": "ungraceful shutdown - teardown was unsuccessful: socket did not appear before context was canceled",
             "final_backup_complete": 1,
             "volume_snapshot": {}
         },