From 89c3e0141ef95831c8260b91318006846d1963fc Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 7 Jul 2017 16:00:19 +0100 Subject: [PATCH] Adding missing arguments to Wrapf I noticed some "%q!!missing!!" in my logs and found: $ git grep 'f(.*, ".*%q.*")' metadata/containers.go: return containers.Container{}, errors.Wrapf(errdefs.ErrNotFound, "bucket name %q") metadata/containers.go: err = errors.Wrapf(errdefs.ErrAlreadyExists, "content %q") metadata/namespaces.go: return errors.Wrapf(errdefs.ErrAlreadyExists, "namespace %q") Signed-off-by: Ian Campbell --- metadata/containers.go | 4 ++-- metadata/namespaces.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/metadata/containers.go b/metadata/containers.go index 3926c74dc..fa58985d9 100644 --- a/metadata/containers.go +++ b/metadata/containers.go @@ -34,7 +34,7 @@ func (s *containerStore) Get(ctx context.Context, id string) (containers.Contain bkt := getContainerBucket(s.tx, namespace, id) if bkt == nil { - return containers.Container{}, errors.Wrapf(errdefs.ErrNotFound, "bucket name %q") + return containers.Container{}, errors.Wrapf(errdefs.ErrNotFound, "bucket name %q:%q", namespace, id) } container := containers.Container{ID: id} @@ -144,7 +144,7 @@ func (s *containerStore) Create(ctx context.Context, container containers.Contai cbkt, err := bkt.CreateBucket([]byte(container.ID)) if err != nil { if err == bolt.ErrBucketExists { - err = errors.Wrapf(errdefs.ErrAlreadyExists, "content %q") + err = errors.Wrapf(errdefs.ErrAlreadyExists, "content %q", container.ID) } return containers.Container{}, err } diff --git a/metadata/namespaces.go b/metadata/namespaces.go index 5aa19b3fe..567f2f181 100644 --- a/metadata/namespaces.go +++ b/metadata/namespaces.go @@ -32,7 +32,7 @@ func (s *namespaceStore) Create(ctx context.Context, namespace string, labels ma bkt, err := topbkt.CreateBucket([]byte(namespace)) if err != nil { if err == bolt.ErrBucketExists { - return errors.Wrapf(errdefs.ErrAlreadyExists, "namespace %q") + return errors.Wrapf(errdefs.ErrAlreadyExists, "namespace %q", namespace) } return err