[ws-manager] When a workspace times out, log the expected timeout instead of the actual time spent

jankeromnes · jankeromnes · commit c997daf0a131 · 2021-05-21T09:23:35.000+02:00
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"
 }

Original file line number	Diff line number	Diff line change
`@@ -709,7 +709,7 @@ func (m *Manager) isWorkspaceTimedOut(wso workspaceObjects) (reason string, err`
`709`	`709`	`return "", nil`
`710`	`710`	`}`
`711`	`711`
`712`		`- return fmt.Sprintf("workspace timed out after %s took longer than %s", activity, formatDuration(inactivity)), nil`
	`712`	`+ return fmt.Sprintf("workspace timed out after %s (%s) took longer than %s", activity, formatDuration(inactivity), formatDuration(td)), nil`
`713`	`713`	`}`
`714`	`714`
`715`	`715`	`start := wso.Pod.ObjectMeta.CreationTimestamp.Time`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "reason": "workspace timed out after period of inactivity took longer than 01h10m"`
	`2`	`+ "reason": "workspace timed out after period of inactivity (01h10m) took longer than 00h45m"`
`3`	`3`	`}`