Merge pull request #1221 from tonistiigi/leases-follow-up

cache: follow-up updates to storage leases
moby · Oct 22, 2019 · 4f4e030 · 4f4e030
2 parents 02adc6b + 1d867eb
commit 4f4e030
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/cache/manager.go b/cache/manager.go
@@ -100,8 +100,10 @@ func (cm *cacheManager) GetByBlob(ctx context.Context, desc ocispec.Descriptor,
 	chainID := diffID
 	blobChainID := imagespecidentity.ChainID([]digest.Digest{desc.Digest, diffID})
 
-	if _, err := cm.ContentStore.Info(ctx, desc.Digest); err != nil {
-		return nil, errors.Wrapf(err, "failed to get blob %s", desc.Digest)
+	if desc.Digest != "" {
+		if _, err := cm.ContentStore.Info(ctx, desc.Digest); err != nil {
+			return nil, errors.Wrapf(err, "failed to get blob %s", desc.Digest)
+		}
 	}
 
 	var p *immutableRef
@@ -202,11 +204,13 @@ func (cm *cacheManager) GetByBlob(ctx context.Context, desc ocispec.Descriptor,
 		return nil, errors.Wrapf(err, "failed to add snapshot %s to lease", id)
 	}
 
-	if err := cm.ManagerOpt.LeaseManager.AddResource(ctx, leases.Lease{ID: id}, leases.Resource{
-		ID:   desc.Digest.String(),
-		Type: "content",
-	}); err != nil {
-		return nil, errors.Wrapf(err, "failed to add blob %s to lease", id)
+	if desc.Digest != "" {
+		if err := cm.ManagerOpt.LeaseManager.AddResource(ctx, leases.Lease{ID: id}, leases.Resource{
+			ID:   desc.Digest.String(),
+			Type: "content",
+		}); err != nil {
+			return nil, errors.Wrapf(err, "failed to add blob %s to lease", id)
+		}
 	}
 
 	md, _ := cm.md.Get(id)

diff --git a/cache/migrate_v2.go b/cache/migrate_v2.go
@@ -148,6 +148,9 @@ func MigrateV2(ctx context.Context, from, to string, cs content.Store, s snapsho
 		if err := v.Unmarshal(&blob); err != nil {
 			return errors.WithStack(err)
 		}
+		if _, err := cs.Info(ctx, digest.Digest(blob.Blobsum)); err != nil {
+			continue
+		}
 		queueDiffID(item, blob.DiffID)
 		queueBlob(item, blob.Blobsum)
 		queueMediaType(item, images.MediaTypeDockerSchema2LayerGzip)