fix: prevent dolt journal corruption from concurrent server starts#2504
Merged
steveyegge merged 1 commit intomainfrom Mar 12, 2026
Merged
fix: prevent dolt journal corruption from concurrent server starts#2504steveyegge merged 1 commit intomainfrom
steveyegge merged 1 commit intomainfrom
Conversation
… (GH#2430) KillStaleServers was called outside the exclusive file lock in EnsureRunning(), creating a race where one process could kill a server that another process was in the middle of starting (PID file not yet written). This caused concurrent dolt sql-server instances to corrupt the journal file. Moving the cleanup inside Start() after the flock is acquired ensures the kill-and-start sequence is atomic — no other process can interfere between orphan cleanup and PID file creation. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
KillStaleServers()ran outside the flock inEnsureRunning(), allowing onebdprocess to kill a server that another process was actively starting (PID file not yet written)KillStaleServers()insideStart()after the exclusive flock is acquired, making orphan cleanup and server start atomicdolt sql-serverinstances writing to the same journal fileTest plan
go build ./internal/doltserver/compilesgo test ./internal/doltserver/passesbdcommands that only one server starts (manual test with multiple terminals)Fixes #2430
🤖 Generated with Claude Code