builder-next: close progress on layer export error

tonistiigi · Tibor Vass · commit fe1abc12440e · 2019-08-22T18:08:51.000Z
Signed-off-by: Tonis Tiigi &lt;tonistiigi@gmail.com&gt;
(cherry picked from commit 27f1f2b5bee0eb8532700eca8976509096060984)
Signed-off-by: Tibor Vass &lt;tibor@docker.com&gt;
Upstream-commit: 613a32482f5ac7f8b7da111265752235371a91fe
Component: engine
diff --git a/components/engine/builder/builder-next/exporter/export.go b/components/engine/builder/builder-next/exporter/export.go
@@ -117,12 +117,12 @@ func (e *imageExporterInstance) Export(ctx context.Context, inp exporter.Source)
 		layersDone := oneOffProgress(ctx, "exporting layers")
 
 		if err := ref.Finalize(ctx, true); err != nil {
-			return nil, err
+			return nil, layersDone(err)
 		}
 
 		diffIDs, err := e.opt.Differ.EnsureLayer(ctx, ref.ID())
 		if err != nil {
-			return nil, err
+			return nil, layersDone(err)
 		}
 
 		diffs = make([]digest.Digest, len(diffIDs))

Original file line number	Diff line number	Diff line change
`@@ -117,12 +117,12 @@ func (e *imageExporterInstance) Export(ctx context.Context, inp exporter.Source)`
`117`	`117`	`layersDone := oneOffProgress(ctx, "exporting layers")`
`118`	`118`
`119`	`119`	`if err := ref.Finalize(ctx, true); err != nil {`
`120`		`- return nil, err`
	`120`	`+ return nil, layersDone(err)`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`diffIDs, err := e.opt.Differ.EnsureLayer(ctx, ref.ID())`
`124`	`124`	`if err != nil {`
`125`		`- return nil, err`
	`125`	`+ return nil, layersDone(err)`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`diffs = make([]digest.Digest, len(diffIDs))`