Made fixes and optimizations to encryption GC

lumjjb · lumjjb · commit c00517a94c80 · 2019-07-18T15:15:32.000-04:00
Signed-off-by: Brandon Lum &lt;lumjjb@gmail.com&gt;
diff --git a/images/encryption/encryption.go b/images/encryption/encryption.go
@@ -205,16 +205,20 @@ func cryptLayer(ctx context.Context, cs content.Store, ls leases.Manager, l leas
 				return ocispec.Descriptor{}, errors.Wrap(err, "failed to write config")
 			}
 		} else {
-			newDesc.Digest, newDesc.Size, err = ingestReader(ctx, cs, ref, resultReader)
+			newDesc.Digest, newDesc.Size, err = ingestReaderLeaseContent(ctx, cs, ls, l, ref, resultReader)
 			if err != nil {
 				return ocispec.Descriptor{}, err
 			}
+			// Delete the ingest lease since the blob is protected now by the content lease
+			if err := ls.DeleteResource(ctx, l, rsrc); err != nil {
+				return ocispec.Descriptor{}, errors.Wrap(err, "Unable to delete resource from lease")
+			}
 		}
 	}
 	return newDesc, err
 }
 
-func ingestReader(ctx context.Context, cs content.Ingester, ref string, r io.Reader) (digest.Digest, int64, error) {
+func ingestReaderLeaseContent(ctx context.Context, cs content.Ingester, ls leases.Manager, l leases.Lease, ref string, r io.Reader) (digest.Digest, int64, error) {
 	cw, err := content.OpenWriter(ctx, cs, content.WithRef(ref))
 	if err != nil {
 		return "", 0, errors.Wrap(err, "failed to open writer")
@@ -230,7 +234,16 @@ func ingestReader(ctx context.Context, cs content.Ingester, ref string, r io.Rea
 		return "", 0, errors.Wrap(err, "failed to get state")
 	}
 
-	if err := cw.Commit(ctx, st.Offset, ""); err != nil {
+	rsrc := leases.Resource{
+		ID:   cw.Digest().String(),
+		Type: "content",
+	}
+
+	if err := ls.AddResource(ctx, l, rsrc); err != nil {
+		return "", 0, errors.Wrapf(err, "Unable to add resource to lease")
+	}
+
+	if err := cw.Commit(ctx, st.Offset, cw.Digest()); err != nil {
 		if !errdefs.IsAlreadyExists(err) {
 			return "", 0, errors.Wrapf(err, "failed commit on ref %q", ref)
 		}
@@ -324,7 +337,7 @@ func cryptChildren(ctx context.Context, cs content.Store, ls leases.Manager, l l
 		}
 
 		rsrc := leases.Resource{
-			ID:   desc.Digest.String(),
+			ID:   newDesc.Digest.String(),
 			Type: "content",
 		}
 
@@ -415,7 +428,7 @@ func cryptManifestList(ctx context.Context, cs content.Store, ls leases.Manager,
 		}
 
 		rsrc := leases.Resource{
-			ID:   desc.Digest.String(),
+			ID:   newDesc.Digest.String(),
 			Type: "content",
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -205,16 +205,20 @@ func cryptLayer(ctx context.Context, cs content.Store, ls leases.Manager, l leas`
`205`	`205`	`return ocispec.Descriptor{}, errors.Wrap(err, "failed to write config")`
`206`	`206`	`}`
`207`	`207`	`} else {`
`208`		`- newDesc.Digest, newDesc.Size, err = ingestReader(ctx, cs, ref, resultReader)`
	`208`	`+ newDesc.Digest, newDesc.Size, err = ingestReaderLeaseContent(ctx, cs, ls, l, ref, resultReader)`
`209`	`209`	`if err != nil {`
`210`	`210`	`return ocispec.Descriptor{}, err`
`211`	`211`	`}`
	`212`	`+ // Delete the ingest lease since the blob is protected now by the content lease`
	`213`	`+ if err := ls.DeleteResource(ctx, l, rsrc); err != nil {`
	`214`	`+ return ocispec.Descriptor{}, errors.Wrap(err, "Unable to delete resource from lease")`
	`215`	`+ }`
`212`	`216`	`}`
`213`	`217`	`}`
`214`	`218`	`return newDesc, err`
`215`	`219`	`}`
`216`	`220`
`217`		`-func ingestReader(ctx context.Context, cs content.Ingester, ref string, r io.Reader) (digest.Digest, int64, error) {`
	`221`	`+func ingestReaderLeaseContent(ctx context.Context, cs content.Ingester, ls leases.Manager, l leases.Lease, ref string, r io.Reader) (digest.Digest, int64, error) {`
`218`	`222`	`cw, err := content.OpenWriter(ctx, cs, content.WithRef(ref))`
`219`	`223`	`if err != nil {`
`220`	`224`	`return "", 0, errors.Wrap(err, "failed to open writer")`
`@@ -230,7 +234,16 @@ func ingestReader(ctx context.Context, cs content.Ingester, ref string, r io.Rea`
`230`	`234`	`return "", 0, errors.Wrap(err, "failed to get state")`
`231`	`235`	`}`
`232`	`236`
`233`		`- if err := cw.Commit(ctx, st.Offset, ""); err != nil {`
	`237`	`+ rsrc := leases.Resource{`
	`238`	`+ ID: cw.Digest().String(),`
	`239`	`+ Type: "content",`
	`240`	`+ }`
	`241`	`+`
	`242`	`+ if err := ls.AddResource(ctx, l, rsrc); err != nil {`
	`243`	`+ return "", 0, errors.Wrapf(err, "Unable to add resource to lease")`
	`244`	`+ }`
	`245`	`+`
	`246`	`+ if err := cw.Commit(ctx, st.Offset, cw.Digest()); err != nil {`
`234`	`247`	`if !errdefs.IsAlreadyExists(err) {`
`235`	`248`	`return "", 0, errors.Wrapf(err, "failed commit on ref %q", ref)`
`236`	`249`	`}`
`@@ -324,7 +337,7 @@ func cryptChildren(ctx context.Context, cs content.Store, ls leases.Manager, l l`
`324`	`337`	`}`
`325`	`338`
`326`	`339`	`rsrc := leases.Resource{`
`327`		`- ID: desc.Digest.String(),`
	`340`	`+ ID: newDesc.Digest.String(),`
`328`	`341`	`Type: "content",`
`329`	`342`	`}`
`330`	`343`
`@@ -415,7 +428,7 @@ func cryptManifestList(ctx context.Context, cs content.Store, ls leases.Manager,`
`415`	`428`	`}`
`416`	`429`
`417`	`430`	`rsrc := leases.Resource{`
`418`		`- ID: desc.Digest.String(),`
	`431`	`+ ID: newDesc.Digest.String(),`
`419`	`432`	`Type: "content",`
`420`	`433`	`}`
`421`	`434`