Skip to content

fix: applyConfigDefaults uses full port resolution chain #2591

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 2 commits into from
Mar 15, 2026
Merged

fix: applyConfigDefaults uses full port resolution chain #2591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b7bb92
fix: applyConfigDefaults uses full port resolution chain
mrmaxsteel Mar 14, 2026
3f8f400
style: fix gofmt on import.go (pre-existing)
mrmaxsteel Mar 14, 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
2 changes: 1 addition & 1 deletion cmd/bd/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ EXAMPLES:
bd import backup.jsonl # Import from a specific file
bd import --dry-run # Show what would be imported`,
GroupID: "sync",
RunE: runImport,
RunE: runImport,
}

var (
Expand Down
10 changes: 9 additions & 1 deletion internal/storage/dolt/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,15 @@ func applyConfigDefaults(cfg *Config) {
cfg.ServerPort = p
}
}
// If env var didn't provide a port, consult the full resolution chain:
// port file > config.yaml > metadata.json (GH#2590).
// Previously, port 0 fell through to the MySQL driver default (3307),
// causing cross-project connections when another Dolt sat on 3307.
if cfg.ServerPort == 0 && cfg.Path != "" {
if resolved := doltserver.DefaultConfig(cfg.Path); resolved.Port > 0 {
cfg.ServerPort = resolved.Port
}
}
// Port 0 means "not yet resolved" — auto-start (EnsureRunning) will
// allocate an ephemeral port. Don't default to 3307 as that caused
// cross-project data leakage (GH#2098, GH#2372).
Expand Down Expand Up @@ -1844,7 +1853,6 @@ func (s *DoltStore) tryAutoResolveMetadataConflicts(ctx context.Context, tx *sql
return true, nil
}


// Branch creates a new branch
func (s *DoltStore) Branch(ctx context.Context, name string) (retErr error) {
ctx, span := doltTracer.Start(ctx, "dolt.branch",
Expand Down
Loading