[ws-manager] When a workspace times out, log the expected timeout ins…

…tead of the actual time spent
gitpod-io · May 20, 2021 · 35a6e02 · 35a6e02
1 parent dd0826c
commit 35a6e02
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/components/ws-manager/pkg/manager/status.go b/components/ws-manager/pkg/manager/status.go
@@ -709,7 +709,7 @@ func (m *Manager) isWorkspaceTimedOut(wso workspaceObjects) (reason string, err
 			return "", nil
 		}
 
-		return fmt.Sprintf("workspace timed out after %s took longer than %s", activity, formatDuration(inactivity)), nil
+		return fmt.Sprintf("workspace timed out after %s (%s) took longer than %s", activity, formatDuration(inactivity), formatDuration(td)), nil
 	}
 
 	start := wso.Pod.ObjectMeta.CreationTimestamp.Time

diff --git a/components/ws-manager/pkg/manager/testdata/timeout_customTimeout_invalidValue.golden b/components/ws-manager/pkg/manager/testdata/timeout_customTimeout_invalidValue.golden
@@ -1,3 +1,3 @@
 {
-    "reason": "workspace timed out after period of inactivity took longer than 01h10m"
+    "reason": "workspace timed out after period of inactivity (01h10m) took longer than 00h45m"
 }
diff --git a/components/ws-manager/pkg/manager/testdata/timeout_interrupted_noActivity.golden b/components/ws-manager/pkg/manager/testdata/timeout_interrupted_noActivity.golden
@@ -1,3 +1,3 @@
 {
-    "reason": "workspace timed out after workspace interruption took longer than 00h10m"
+    "reason": "workspace timed out after workspace interruption (00h10m) took longer than 00h05m"
 }
diff --git a/components/ws-manager/pkg/manager/testdata/timeout_interrupted_withActivity.golden b/components/ws-manager/pkg/manager/testdata/timeout_interrupted_withActivity.golden
@@ -1,3 +1,3 @@
 {
-    "reason": "workspace timed out after workspace interruption took longer than 00h10m"
+    "reason": "workspace timed out after workspace interruption (00h10m) took longer than 00h05m"
 }
diff --git a/components/ws-manager/pkg/manager/testdata/timeout_prebuild_Creating00.golden b/components/ws-manager/pkg/manager/testdata/timeout_prebuild_Creating00.golden
@@ -1,3 +1,3 @@
 {
-    "reason": "workspace timed out after pulling images took longer than 00h50m"
+    "reason": "workspace timed out after pulling images (00h50m) took longer than 00h45m"
 }
diff --git a/components/ws-manager/pkg/manager/testdata/timeout_prebuild_Pending00.golden b/components/ws-manager/pkg/manager/testdata/timeout_prebuild_Pending00.golden
@@ -1,3 +1,3 @@
 {
-    "reason": "workspace timed out after initialization took longer than 00h50m"
+    "reason": "workspace timed out after initialization (00h50m) took longer than 00h30m"
 }
diff --git a/components/ws-manager/pkg/manager/testdata/timeout_prebuild_overdue.golden b/components/ws-manager/pkg/manager/testdata/timeout_prebuild_overdue.golden
@@ -1,3 +1,3 @@
 {
-    "reason": "workspace timed out after running the headless workspace took longer than 01h40m"
+    "reason": "workspace timed out after running the headless workspace (01h40m) took longer than 01h30m"
 }
diff --git a/components/ws-manager/pkg/manager/testdata/timeout_probe_Creating00.golden b/components/ws-manager/pkg/manager/testdata/timeout_probe_Creating00.golden
@@ -1,3 +1,3 @@
 {
-    "reason": "workspace timed out after pulling images took longer than 00h50m"
+    "reason": "workspace timed out after pulling images (00h50m) took longer than 00h45m"
 }
diff --git a/components/ws-manager/pkg/manager/testdata/timeout_regular_closed.golden b/components/ws-manager/pkg/manager/testdata/timeout_regular_closed.golden
@@ -1,3 +1,3 @@
 {
-    "reason": "workspace timed out after after being closed took longer than 00h10m"
+    "reason": "workspace timed out after after being closed (00h10m) took longer than 00h01m"
 }
diff --git a/components/ws-manager/pkg/manager/testdata/timeout_regular_noActivity.golden b/components/ws-manager/pkg/manager/testdata/timeout_regular_noActivity.golden
@@ -1,3 +1,3 @@
 {
-    "reason": "workspace timed out after period of inactivity took longer than 01h10m"
+    "reason": "workspace timed out after period of inactivity (01h10m) took longer than 00h45m"
 }