From 4cb5c9336fc14ddf3fefebae294735274c4d9f9c Mon Sep 17 00:00:00 2001 From: JenTing Hsiao Date: Wed, 3 Aug 2022 13:40:18 +0800 Subject: [PATCH] Add annotation gitpod.io/startedDisposal once we enter finalize workspace content Signed-off-by: JenTing Hsiao --- components/ws-manager/pkg/manager/monitor.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components/ws-manager/pkg/manager/monitor.go b/components/ws-manager/pkg/manager/monitor.go index c67690c35c2e25..735e7c4530adef 100644 --- a/components/ws-manager/pkg/manager/monitor.go +++ b/components/ws-manager/pkg/manager/monitor.go @@ -984,6 +984,12 @@ 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 { @@ -1090,12 +1096,6 @@ 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