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

Fix retry logic within devmapper device deactivation

Browse Source 
Signed-off-by: Swagat Bora <sbora@amazon.com>
This commit is contained in:
Swagat Bora
2023-02-09 23:40:09 +00:00
parent 3d32da8f60
commit 6ae3e5df6a
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
snapshots/devmapper/pool_device.go
View File

@@ -88,6 +88,15 @@ func NewPoolDevice(ctx context.Context, config *Config) (*PoolDevice, error) {
return poolDevice, nil 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 { func retry(ctx context.Context, f func() error) error {
var ( var (
maxRetries = 100 maxRetries = 100
@@ -97,9 +106,8 @@ func retry(ctx context.Context, f func() error) error {
for attempt := 1; attempt <= maxRetries; attempt++ { for attempt := 1; attempt <= maxRetries; attempt++ {
retryErr = f() retryErr = f()
if retryErr == nil {
return nil if skipRetry(retryErr) {
} else if retryErr != unix.EBUSY {
return retryErr return retryErr
} }