session(auth): cancel blocked credential callbacks#6641
Merged
crazy-max merged 1 commit intomoby:masterfrom Apr 2, 2026
Merged
session(auth): cancel blocked credential callbacks#6641crazy-max merged 1 commit intomoby:masterfrom
crazy-max merged 1 commit intomoby:masterfrom
Conversation
db35f19 to
b0818f7
Compare
0037029 to
29e2331
Compare
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
29e2331 to
d6d3c4d
Compare
tonistiigi
approved these changes
Apr 2, 2026
Member
tonistiigi
left a comment
There was a problem hiding this comment.
This seems ok but it is only affecting the manual cancellation case, so probably more fixes needed to handle the issues in the related discussion.
This file contains hidden or 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.
Narrow fix for one concrete problem discussed in #6633. It's related to the broader auth deadlock discussion and the patch stack in #6630, but it only addresses the credential callback cancellation bug rather than the larger concurrency changes proposed there. It's also relevant to the repro effort in #6638, because it adds integration coverage for a real session auth cancellation path without taking the broader rewrite.
Tested integration test without fix and failed as expected: https://github.com/moby/buildkit/actions/runs/23849960618/job/69528134201?pr=6641#step:8:2972