github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

reliably remove image when content missing

Browse Source 
Signed-off-by: yason <yan.xuean@zte.com.cn>
This commit is contained in:
yason 2017-12-12 17:45:06 +08:00
parent 4762b3e273
commit 5f6d9a5fcc
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/server/image_pull.go
View File

@ -59,6 +59,9 @@ import (
// if we saw an image without snapshots or with in-complete contents during startup, // if we saw an image without snapshots or with in-complete contents during startup,
// should we re-pull the image? Or should we remove the entry? // should we re-pull the image? Or should we remove the entry?
// //
// yanxuean: We cann't delete image directly, because we don't know if the image
// is pulled by us. There are resource leakage.
//
// 2) Containerd suggests user to add entry before pulling the image. However if // 2) Containerd suggests user to add entry before pulling the image. However if
// an error occurrs during the pulling, should we remove the entry from metadata // an error occurrs during the pulling, should we remove the entry from metadata
// store? Or should we leave it there until next startup (resource leakage)? // store? Or should we leave it there until next startup (resource leakage)?

21
pkg/server/image_remove.go
View File

@ -53,14 +53,27 @@ func (c *criContainerdService) RemoveImage(ctx context.Context, r *runtime.Remov
} }
desc, err := cImage.Config(ctx) desc, err := cImage.Config(ctx)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to get image %q config descriptor: %v", tag, err) // We can only get image id by reading Config from content.
} // If the config is missing, we will fail to get image id,
cID := desc.Digest.String() // So we will can't remove the image forever,
if cID == image.ID { // and cri-containerd always report the image is ok.
// But we also don't check it by manifest,
// It's possible that two manifest digests have the same image ID in theory.
// In theory it's possible that an image is compressed with different algorithms,
// then they'll have the same uncompressed id - image id,
// but different ids generated from compressed contents - manifest digest.
// So we decide to leave it.
// After all, the user can override the repoTag by pulling image again.
glog.Errorf("can't remove image,failed to get config for Image tag %q,id %q: %v", tag, image.ID, err)
image.RepoTags = append(image.RepoTags[:i], image.RepoTags[i+1:]...)
continue continue
} }
cID := desc.Digest.String()
if cID != image.ID {
glog.V(4).Infof("Image tag %q for %q is outdated, it's currently used by %q", tag, image.ID, cID) glog.V(4).Infof("Image tag %q for %q is outdated, it's currently used by %q", tag, image.ID, cID)
image.RepoTags = append(image.RepoTags[:i], image.RepoTags[i+1:]...) image.RepoTags = append(image.RepoTags[:i], image.RepoTags[i+1:]...)
continue
}
} }
// Include all image references, including RepoTag, RepoDigest and id. // Include all image references, including RepoTag, RepoDigest and id.