Skip to content

Optimize BlockOnLock retry loop to eliminate per-iteration allocations #10444

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
coffeegoddd merged 3 commits into from
Feb 6, 2026
Merged

Optimize BlockOnLock retry loop to eliminate per-iteration allocations #10444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6f3240
Initial plan
Copilot Feb 6, 2026
3e82923
Optimize BlockOnLock to use time.Ticker instead of time.After
Copilot Feb 6, 2026
81cda8c
Optimize fast path by lazy-initializing ticker
Copilot Feb 6, 2026
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
7 changes: 4 additions & 3 deletions go/store/nbs/file_manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,10 @@ import (
)

const (
manifestFileName = "manifest"
lockFileName = "LOCK"
lockFileTimeout = time.Millisecond * 100
manifestFileName = "manifest"
lockFileName = "LOCK"
lockFileTimeout = time.Millisecond * 100
lockRetryInterval = time.Millisecond * 10

storageVersion4 = "4"

Expand Down
11 changes: 10 additions & 1 deletion go/store/nbs/journal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,12 @@ func newJournalManifest(ctx context.Context, dir string, opts JournalingStoreOpt
// try to take the file lock. if we fail, make the manifest read-only.
// if we succeed, hold the file lock until we close the journalManifest
if opts.BlockOnLock {
var ticker *time.Ticker
defer func() {
if ticker != nil {
ticker.Stop()
}
}()
for {
err = lock.TryLock()
if err == nil {
Expand All @@ -564,10 +570,13 @@ func newJournalManifest(ctx context.Context, dir string, opts JournalingStoreOpt
if !errors.Is(err, fslock.ErrLocked) {
return nil, err
}
if ticker == nil {
ticker = time.NewTicker(lockRetryInterval)
}
select {
case <-ctx.Done():
return nil, ctx.Err()
case <-time.After(10 * time.Millisecond):
case <-ticker.C:
}
}
} else {
Expand Down