Fix retry logic within devmapper device deactivation

Signed-off-by: Swagat Bora <sbora@amazon.com> (cherry picked from commit 6ae3e5d) Signed-off-by: Swagat Bora <sbora@amazon.com>
containerd · Feb 10, 2023 · 0d16d04 · 0d16d04
1 parent 9e9f4c8
commit 0d16d04
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/snapshots/devmapper/pool_device.go b/snapshots/devmapper/pool_device.go
@@ -76,6 +76,15 @@ func NewPoolDevice(ctx context.Context, config *Config) (*PoolDevice, error) {
 	return poolDevice, nil
 }
 
+func skipRetry(err error) bool {
+	if err == nil {
+		return true // skip retry if no error
+	} else if !errors.Is(err, unix.EBUSY) {
+		return true // skip retry if error is not due to device or resource busy
+	}
+	return false
+}
+
 func retry(ctx context.Context, f func() error) error {
 	var (
 		maxRetries = 100
@@ -85,9 +94,8 @@ func retry(ctx context.Context, f func() error) error {
 
 	for attempt := 1; attempt <= maxRetries; attempt++ {
 		retryErr = f()
-		if retryErr == nil {
-			return nil
-		} else if retryErr != unix.EBUSY {
+
+		if skipRetry(retryErr) {
 			return retryErr
 		}