progress: fix clean context cancelling #3443
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
AkihiroSuda
reviewed
Dec 31, 2022
| @@ -106,6 +106,7 @@ func trackProgress(ctx context.Context, desc ocispecs.Descriptor, manager PullMa | |||
| select { | |||
| case <-ctx.Done(): | |||
| onFinalStatus = true | |||
| ctx = context.TODO() | |||
There was a problem hiding this comment.
Could you add a comment line to explain this?
Signed-off-by: Tonis Tiigi <[email protected]>
tonistiigi
force-pushed
the
progress-cancel
branch
from
b53706e to
c905063
Compare
AkihiroSuda
approved these changes
Jan 6, 2023
Merged
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.
@sipsma I'm not sure if this is best solution so feel free to open an alternative but discovered that the current state is not quite correct.
When
case <-ctx.Done():gets called it doesn't return out of the function but setsonFinalStatusto return after iteration. But then it callsmanager.Status(ctxthat is guaranteed to error because we already know that the context is closed. Because the error handling is relaxed it doesn't error the function but still logs error message every time.Signed-off-by: Tonis Tiigi [email protected]