Merge pull request #3822 from fuweid/cherry-pick-3819-1.3

crosbymichael · web-flow · commit b5ede206a4e3 · 2019-11-12T11:23:10.000-05:00
[release/1.3] snapshots: return error if readSnapshot fails
diff --git a/snapshots/storage/bolt.go b/snapshots/storage/bolt.go
@@ -297,7 +297,7 @@ func Remove(ctx context.Context, key string) (string, snapshots.Kind, error) {
 		}
 
 		if err := readSnapshot(sbkt, &id, &si); err != nil {
-			errors.Wrapf(err, "failed to read snapshot %s", key)
+			return errors.Wrapf(err, "failed to read snapshot %s", key)
 		}
 
 		if pbkt != nil {

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ func Remove(ctx context.Context, key string) (string, snapshots.Kind, error) {`
`297`	`297`	`}`
`298`	`298`
`299`	`299`	`if err := readSnapshot(sbkt, &id, &si); err != nil {`
`300`		`- errors.Wrapf(err, "failed to read snapshot %s", key)`
	`300`	`+ return errors.Wrapf(err, "failed to read snapshot %s", key)`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`if pbkt != nil {`