Merge pull request #488 from docker/fix/posixage

joe0BAB · web-flow · commit f580386b57a5 · 2026-03-12T10:44:35.000+01:00
fix(store/posixage): always close file lock
diff --git a/store/posixage/internal/flock/flock.go b/store/posixage/internal/flock/flock.go
@@ -89,7 +89,8 @@ func tryLock(ctx context.Context, root *os.Root, exclusive bool) (UnlockFunc, er
 		return nil, err
 	}
 	// recovery was successful. Let's try get another lock one last time.
-	if err := retryLock(ctx, fl, exclusive); err != nil {
+	err = retryLock(ctx, fl, exclusive)
+	if err != nil {
 		return nil, err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,8 @@ func tryLock(ctx context.Context, root *os.Root, exclusive bool) (UnlockFunc, er`
`89`	`89`	`return nil, err`
`90`	`90`	`}`
`91`	`91`	`// recovery was successful. Let's try get another lock one last time.`
`92`		`- if err := retryLock(ctx, fl, exclusive); err != nil {`
	`92`	`+ err = retryLock(ctx, fl, exclusive)`
	`93`	`+ if err != nil {`
`93`	`94`	`return nil, err`
`94`	`95`	`}`
`95`	`96`