Skip to content

refactor(posixage/flock): tidy tryLock structure and test name #527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Benehiko merged 1 commit into from
May 26, 2026
+13 −12
Merged

refactor(posixage/flock): tidy tryLock structure and test name #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions store/posixage/internal/flock/flock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,20 +77,21 @@ func tryLock(ctx context.Context, root *os.Root, exclusive bool) (UnlockFunc, er
}
err = errors.Join(ErrLockUnsuccessful, err)

if ctx.Err() == nil {
if recoverErr := recoverStaleLock(root, fl); recoverErr != nil && !errors.Is(recoverErr, errRecoverLock) {
return nil, errors.Join(err, recoverErr)
}
fl = nil
if ctx.Err() != nil {
return nil, errors.Join(err, ctx.Err())
}

fl, err = openFile(root)
if err != nil {
return nil, err
}
// recoverStaleLock always closes fl; clear our reference so the deferred
// close-on-error cleanup does not double-close it.
recoverErr := recoverStaleLock(root, fl)
fl = nil
if recoverErr != nil && !errors.Is(recoverErr, errRecoverLock) {
return nil, errors.Join(err, recoverErr)
}

if ctx.Err() != nil {
return nil, errors.Join(err, ctx.Err())
fl, err = openFile(root)
if err != nil {
return nil, err
}

err = retryLock(ctx, fl, exclusive)
Expand Down
2 changes: 1 addition & 1 deletion store/posixage/internal/flock/flock_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ func TestFlock(t *testing.T) {
require.NoError(t, unlock())
})

t.Run("caller context can wait past former default timeout", func(t *testing.T) {
t.Run("acquires lock when holder releases before ctx deadline", func(t *testing.T) {
root, err := os.OpenRoot(t.TempDir())
require.NoError(t, err)
t.Cleanup(func() {
Expand Down
Loading