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

Merge pull request #2717 from dmcgowan/diff-set-uncompressed-label

Browse Source 
Set uncompressed label on diff when already exists
This commit is contained in:
Michael Crosby 2018-10-15 15:16:21 -04:00 committed by GitHub
commit 3f5e6cdeaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
diff/walking/differ.go
View File

@ -41,6 +41,7 @@ type walkingDiff struct {
} }
var emptyDesc = ocispec.Descriptor{} var emptyDesc = ocispec.Descriptor{}
var uncompressed = "containerd.io/uncompressed"
// NewWalkingDiff is a generic implementation of diff.Comparer. The diff is // NewWalkingDiff is a generic implementation of diff.Comparer. The diff is
// calculated by mounting both the upper and lower mount sets and walking the // calculated by mounting both the upper and lower mount sets and walking the
@ -125,7 +126,7 @@ func (s *walkingDiff) Compare(ctx context.Context, lower, upper []mount.Mount, o
if config.Labels == nil { if config.Labels == nil {
config.Labels = map[string]string{} config.Labels = map[string]string{}
} }
config.Labels["containerd.io/uncompressed"] = dgstr.Digest().String() config.Labels[uncompressed] = dgstr.Digest().String()
} else { } else {
if err = archive.WriteDiff(ctx, cw, lowerRoot, upperRoot); err != nil { if err = archive.WriteDiff(ctx, cw, lowerRoot, upperRoot); err != nil {
return errors.Wrap(err, "failed to write diff") return errors.Wrap(err, "failed to write diff")
@ -149,6 +150,14 @@ func (s *walkingDiff) Compare(ctx context.Context, lower, upper []mount.Mount, o
return errors.Wrap(err, "failed to get info from content store") return errors.Wrap(err, "failed to get info from content store")
} }
// Set uncompressed label if digest already existed without label
if _, ok := info.Labels[uncompressed]; !ok {
info.Labels[uncompressed] = config.Labels[uncompressed]
if _, err := s.store.Update(ctx, info, "labels."+uncompressed); err != nil {
return errors.Wrap(err, "error setting uncompressed label")
}
}
ocidesc = ocispec.Descriptor{ ocidesc = ocispec.Descriptor{
MediaType: config.MediaType, MediaType: config.MediaType,
Size: info.Size, Size: info.Size,