Skip to content

fix: prevent dolt journal corruption from concurrent server starts #2504

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
steveyegge merged 1 commit into from
Mar 12, 2026
Merged

fix: prevent dolt journal corruption from concurrent server starts #2504

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
16 changes: 9 additions & 7 deletions internal/doltserver/doltserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,13 +439,6 @@ func EnsureRunning(beadsDir string) (int, error) {
return state.Port, nil
}

// Clean up orphaned dolt sql-server processes before starting a new one.
// Without this, servers accumulate when parent processes crash or are
// force-killed without graceful shutdown (GH#2372).
if killed, err := KillStaleServers(serverDir); err == nil && len(killed) > 0 {
fmt.Fprintf(os.Stderr, "Info: cleaned up %d orphaned dolt sql-server process(es)\n", len(killed))
}

s, err := Start(serverDir)
if err != nil {
return 0, err
Expand Down Expand Up @@ -495,6 +488,15 @@ func Start(beadsDir string) (*State, error) {
return state, nil
}

// Clean up orphaned dolt sql-server processes INSIDE the lock.
// This MUST happen under the lock to prevent a race where one process
// kills a server that another process is in the middle of starting
// (PID file not yet written). Without this, concurrent bd processes
// can cause journal corruption (GH#2430).
if killed, killErr := KillStaleServers(beadsDir); killErr == nil && len(killed) > 0 {
fmt.Fprintf(os.Stderr, "Info: cleaned up %d orphaned dolt sql-server process(es)\n", len(killed))
}

// Ensure dolt binary exists
doltBin, err := exec.LookPath("dolt")
if err != nil {
Expand Down
Loading