ws-manager: Fix consistency of disposed ws between ws-daemon and ws-manager #12028
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jenting
reviewed
Aug 10, 2022
Comment on lines
1105
to
1117
| val, ok := m.finalizerMap.LoadAndDelete(workspaceID) | ||
| if ok { | ||
| cancelReq := val.(context.CancelFunc) | ||
| cancelReq() | ||
| } | ||
| return false, &csapi.GitStatus{}, nil | ||
| } |
There was a problem hiding this comment.
Can we move these lines upper?
gitpod/components/ws-manager/pkg/manager/monitor.go
Lines 1115 to 1126 in b8669f3
Therefore, we can reuse the defer function.
There was a problem hiding this comment.
@jenting Thanks for your feedback. fixed
utam0k
force-pushed
the
to/retry-prebuild
branch
from
b8669f3 to
7f7bf3e
Compare
|
/werft with-preview 👎 unknown command: with-preview |
|
started the job as gitpod-build-to-retry-prebuild.3 because the annotations in the pull request description changed |
sagor999
approved these changes
Aug 16, 2022
roboquat
added
deployed: workspace
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Due to a retry timing issue, there were cases where the workspace had already been successfully backed up on the ws-daemon side, but ws-manager was trying to back it up again with an error.
More detail
Related Issue(s)
Fixes #11710
How to test
Is there any good way to do this?
Release Notes
Documentation
Werft options: