From 1ba5b3b5538912ba239a376c0c84ea54a062103a Mon Sep 17 00:00:00 2001 From: Stephen J Day Date: Tue, 6 Feb 2018 15:25:51 -0800 Subject: [PATCH 1/2] registry/storage: ignore missing tag on delete Signed-off-by: Stephen J Day --- registry/storage/tagstore.go | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/registry/storage/tagstore.go b/registry/storage/tagstore.go index 3fbed6d39..6a5848c7f 100644 --- a/registry/storage/tagstore.go +++ b/registry/storage/tagstore.go @@ -122,17 +122,20 @@ func (ts *tagStore) Untag(ctx context.Context, tag string) error { name: ts.repository.Named().Name(), tag: tag, }) - - switch err.(type) { - case storagedriver.PathNotFoundError: - return distribution.ErrTagUnknown{Tag: tag} - case nil: - break - default: + if err != nil { return err } - return ts.blobStore.driver.Delete(ctx, tagPath) + if err := ts.blobStore.driver.Delete(ctx, tagPath); err != nil { + switch err.(type) { + case storagedriver.PathNotFoundError: + return nil // Untag is idempotent, we don't care if it didn't exist + default: + return err + } + } + + return nil } // linkedBlobStore returns the linkedBlobStore for the named tag, allowing one From 005c6e0236c98544d35197a17947c02e23bc9223 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Thu, 8 Feb 2018 17:28:22 +0800 Subject: [PATCH 2/2] ignore path not found error when look up tags Signed-off-by: Wenkai Yin --- registry/storage/tagstore.go | 4 ++++ registry/storage/tagstore_test.go | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/registry/storage/tagstore.go b/registry/storage/tagstore.go index 6a5848c7f..ab5f54a66 100644 --- a/registry/storage/tagstore.go +++ b/registry/storage/tagstore.go @@ -182,6 +182,10 @@ func (ts *tagStore) Lookup(ctx context.Context, desc distribution.Descriptor) ([ tagLinkPath, err := pathFor(tagLinkPathSpec) tagDigest, err := ts.blobStore.readlink(ctx, tagLinkPath) if err != nil { + switch err.(type) { + case storagedriver.PathNotFoundError: + continue + } return nil, err } diff --git a/registry/storage/tagstore_test.go b/registry/storage/tagstore_test.go index 5bfa1451a..314fa433c 100644 --- a/registry/storage/tagstore_test.go +++ b/registry/storage/tagstore_test.go @@ -84,8 +84,8 @@ func TestTagStoreUnTag(t *testing.T) { desc := distribution.Descriptor{Digest: "sha256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"} err := tags.Untag(ctx, "latest") - if err == nil { - t.Errorf("Expected error untagging non-existant tag") + if err != nil { + t.Error(err) } err = tags.Tag(ctx, "latest", desc)