backend/remote: do not unlock after a failed upload #21148
Merged
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
pselle
reviewed
Apr 29, 2019
| @@ -141,7 +153,12 @@ func (r *remoteClient) Unlock(id string) error { | |||
|
|
|||
| // Verify the optional force-unlock lock ID. | |||
| if r.organization+"/"+r.workspace.Name != id { | |||
| lockErr.Err = fmt.Errorf("lock ID does not match existing lock") | |||
| lockErr.Err = fmt.Errorf( | |||
There was a problem hiding this comment.
Nice additions making this error more informative!
When changes are made and we failed to upload the state, we should not try to unlock the workspace. Leaving the workspace locked is a good indication something went wrong and also prevents other changes from being applied before the newest state is properly uploaded. Additionally we now output the lock ID when a lock or force-unlock action failed.
svanharmelen
force-pushed
the
svh/f-locks
branch
from
c76875a to
394f20f
Compare
jbardin
approved these changes
Apr 29, 2019
|
I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues. If you have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further. |
ghost
locked and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
When changes are made and we failed to upload the state, we should not
try to unlock the workspace. Leaving the workspace locked is a good
indication something went wrong and also prevents other changes from
being applied before the newest state is properly uploaded.
Additionally we now output the lock ID when a lock or force-unlock
action failed.