Transfer: Push: fix failure on pushing duplicated blobs#10287
Merged
mxpv merged 1 commit intocontainerd:mainfrom Jun 4, 2024
Merged
Transfer: Push: fix failure on pushing duplicated blobs#10287mxpv merged 1 commit intocontainerd:mainfrom
mxpv merged 1 commit intocontainerd:mainfrom
Conversation
Signed-off-by: Kohei Tokunaga <[email protected]>
dmcgowan
approved these changes
May 31, 2024
akhilerm
approved these changes
Jun 3, 2024
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
mxpv
approved these changes
Jun 4, 2024
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
5 participants
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.
Currently transfer service doesn't handle conflict among pushing of duplicated blobs and pushing an image with duplicated blobs fails.
This commit fixes this issue by using
dockerPusher.Writerthat detects the conflict and allow retrying usingcontent.OpenWriterhelper.content.OpenWriteris already used byremotes.PushHandlerto handle duplicated blobs safely.But transfer service doesn't use this so it (and
ctr i push) fails to push duplicated blobs.This commit fixes this issue.
Reproduce
Pushing of
gcr.io/k8s-staging-cri-tools/test-image-tags:1(contains duplicated manifests, as of now) to another registry fails without this patch. (Detected at stargz-snapshotter CI: https://github.com/containerd/stargz-snapshotter/actions/runs/9303215973/job/25605036366?pr=1545#step:4:10911 )