Skip to content

chore: close db properly in early exit paths in ConnectToPostgres #18448

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
merged 1 commit into from
Jun 20, 2025
+5 −8
Merged

chore: close db properly in early exit paths in ConnectToPostgres #18448

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
13 changes: 5 additions & 8 deletions cli/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2312,19 +2312,20 @@ func ConnectToPostgres(ctx context.Context, logger slog.Logger, driver string, d

var err error
var sqlDB *sql.DB
dbNeedsClosing := true
// Try to connect for 30 seconds.
ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
defer cancel()

defer func() {
if err == nil {
if !dbNeedsClosing {
return
}
if sqlDB != nil {
_ = sqlDB.Close()
sqlDB = nil
logger.Debug(ctx, "closed db before returning from ConnectToPostgres")
}
logger.Error(ctx, "connect to postgres failed", slog.Error(err))
}()

var tries int
Expand Down Expand Up @@ -2361,12 +2362,7 @@ func ConnectToPostgres(ctx context.Context, logger slog.Logger, driver string, d
}
defer version.Close()
if !version.Next() {
// it's critical we assign to the err variable, otherwise the defer statement
// that runs db.Close() will not execute it
if err = version.Err(); err != nil {
return nil, xerrors.Errorf("no rows returned for version select: %w", err)
}
return nil, xerrors.Errorf("no rows returned for version select")
return nil, xerrors.Errorf("no rows returned for version select: %w", version.Err())
}
var versionNum int
err = version.Scan(&versionNum)
Expand Down Expand Up @@ -2408,6 +2404,7 @@ func ConnectToPostgres(ctx context.Context, logger slog.Logger, driver string, d
// of connection churn.
sqlDB.SetMaxIdleConns(3)

dbNeedsClosing = false
return sqlDB, nil
}

Expand Down
Loading