[syncer] Only invoke cancel when successful #234
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
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.
In #228, we introduced a regression into
syncerwhere anon-nilerror could be silenced bycontext.Canceled. This PR fixes this regression.In short, we were always calling
context.Cancel()whensyncer.Syncreturned (withdefer). Because of the extra locking on exit added in #228, this delayed the return ofSyncbut not the invocation of cancel. This caused other functions to return with a non-nil error beforesyncer.Sync(which had the useful error) androsetta-clito returncontext.Canceledas the error instead of something interesting (as the expected behavior oferrgroupis to return the first non-nil error fromWait).