Skip to content

Fix double mutex unlock panic in saveData loop #2132

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
mkmccarty merged 3 commits into from
Jan 30, 2026
Merged

Fix double mutex unlock panic in saveData loop #2132

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3389f72
Initial plan
Copilot Jan 30, 2026
60926e3
Fix double mutex unlock bug in saveData loop
Copilot Jan 30, 2026
fe44c37
Merge branch 'mm-branch-1' into copilot/sub-pr-2131
mkmccarty Jan 30, 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
1 change: 1 addition & 0 deletions src/boost/boost_datastore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ func saveData(contractHash string) {
default:
// Queue is full, skip this one (it will be retried in the next save cycle)
log.Printf("Save queue full, skipping contract: %s", contractHash)
delete(pendingSaves, contractHash) // Remove from pending since we couldn't queue it
Copy link

Copilot AI Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

delete(pendingSaves, contractHash) in the default branch is currently a no-op because this branch is only reached when !pendingSaves[contractHash] and the map entry is never set to true before the select. This makes the inline comment misleading and adds confusion. Either remove the delete(...) and adjust the comment, or set pendingSaves[contractHash]=true before attempting to enqueue and only delete(...) on enqueue failure.

Suggested change
delete(pendingSaves, contractHash) // Remove from pending since we couldn't queue it

Copilot uses AI. Check for mistakes.
saveQueueMutex.Unlock()
continue
Comment on lines 115 to 120
Copy link

Copilot AI Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Queue-full handling is improved here, but saveData(contractHash != "") still does a blocking saveQueue <- contractHash while holding saveQueueMutex (see lines ~96-102). If the channel is full, that goroutine blocks holding the mutex; the worker goroutine needs the same mutex to delete(pendingSaves, ...) after processing, so it can deadlock (worker blocks on mutex and stops draining the channel, sender blocks on full channel). Consider never holding saveQueueMutex across a channel send: e.g., check/mark under the mutex, unlock, then do a non-blocking send (and on failure re-lock and unmark), or use the same select { case saveQueue <- ...: ... default: ... } pattern for the single-contract path too.

Copilot uses AI. Check for mistakes.
}
Expand Down
Loading