Merge pull request containerd#9465 from ambarve/sn_cleanup

samuelkarp · web-flow · commit d55bfab176a9 · 2023-12-05T21:33:43.000Z
Don't block snapshot garbage collection on Remove failures
diff --git a/snapshots/windows/windows.go b/snapshots/windows/windows.go
@@ -282,7 +282,9 @@ func (s *snapshotter) Remove(ctx context.Context, key string) error {
 				log.G(ctx).WithError(err1).WithField("path", renamed).Error("Failed to rename after failed commit")
 			}
 		}
-		return err
+		// Return the error wrapped in ErrFailedPrecondition so that cleanup of other snapshots will
+		// still continue.
+		return errors.Join(errdefs.ErrFailedPrecondition, err)
 	}
 
 	if err = hcsshim.DestroyLayer(s.info, renamedID); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,9 @@ func (s *snapshotter) Remove(ctx context.Context, key string) error {`
`282`	`282`	`log.G(ctx).WithError(err1).WithField("path", renamed).Error("Failed to rename after failed commit")`
`283`	`283`	`}`
`284`	`284`	`}`
`285`		`- return err`
	`285`	`+ // Return the error wrapped in ErrFailedPrecondition so that cleanup of other snapshots will`
	`286`	`+ // still continue.`
	`287`	`+ return errors.Join(errdefs.ErrFailedPrecondition, err)`
`286`	`288`	`}`
`287`	`289`
`288`	`290`	`if err = hcsshim.DestroyLayer(s.info, renamedID); err != nil {`