Fix metadata content store to call writer digest after commit

hinshun · hinshun · commit 7d2117245387 · 2019-07-08T07:26:49.000-07:00
Signed-off-by: Edgar Lee &lt;edgarl@netflix.com&gt;
diff --git a/metadata/content.go b/metadata/content.go
@@ -637,11 +637,11 @@ func (nw *namespacedWriter) commit(ctx context.Context, tx *bolt.Tx, size int64,
 			return "", errors.Wrapf(errdefs.ErrFailedPrecondition, "%q failed size validation: %v != %v", nw.ref, status.Offset, size)
 		}
 		size = status.Offset
-		actual = nw.w.Digest()
 
 		if err := nw.w.Commit(ctx, size, expected); err != nil && !errdefs.IsAlreadyExists(err) {
 			return "", err
 		}
+		actual = nw.w.Digest()
 	}
 
 	bkt, err := createBlobBucket(tx, nw.namespace, actual)

Original file line number	Diff line number	Diff line change
`@@ -637,11 +637,11 @@ func (nw namespacedWriter) commit(ctx context.Context, tx bolt.Tx, size int64,`
`637`	`637`	`return "", errors.Wrapf(errdefs.ErrFailedPrecondition, "%q failed size validation: %v != %v", nw.ref, status.Offset, size)`
`638`	`638`	`}`
`639`	`639`	`size = status.Offset`
`640`		`- actual = nw.w.Digest()`
`641`	`640`
`642`	`641`	`if err := nw.w.Commit(ctx, size, expected); err != nil && !errdefs.IsAlreadyExists(err) {`
`643`	`642`	`return "", err`
`644`	`643`	`}`
	`644`	`+ actual = nw.w.Digest()`
`645`	`645`	`}`
`646`	`646`
`647`	`647`	`bkt, err := createBlobBucket(tx, nw.namespace, actual)`