github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Don't lose Compare failure if aborting diff upload fails

Browse Source 
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
This commit is contained in:
Paul "TBBle" Hampson 2020-07-18 03:15:00 +10:00
parent 6636e36182
commit b399e2ef6d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diff/walking/differ.go
View File

@ -99,8 +99,8 @@ func (s *walkingDiff) Compare(ctx context.Context, lower, upper []mount.Mount, o
if err != nil { if err != nil {
cw.Close() cw.Close()
if newReference { if newReference {
if err := s.store.Abort(ctx, config.Reference); err != nil { if abortErr := s.store.Abort(ctx, config.Reference); abortErr != nil {
log.G(ctx).WithField("ref", config.Reference).Warnf("failed to delete diff upload") log.G(ctx).WithError(abortErr).WithField("ref", config.Reference).Warnf("failed to delete diff upload")
} }
} }
} }