NotificationsYou must be signed in to change notification settings
Fork928
Star10.1k

Commit48ee80a

authored

fix(cli): prevent sqlDB leaks in ConnectToPostgres (#10072)

1 parent5d5a7da commit48ee80aCopy full SHA for 48ee80a

File tree

1 file changed

+21

-18

lines changed

cli
- server.go

1 file changed

+21

-18

lines changed

`‎cli/server.go`

Lines changed: 21 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -1875,45 +1875,49 @@ func BuildLogger(inv clibase.Invocation, cfg codersdk.DeploymentValues) (slog.`
`1875`	`1875`	`},nil`
`1876`	`1876`	`}`
`1877`	`1877`
`1878`		`-funcConnectToPostgres(ctx context.Context,logger slog.Logger,driverstring,dbURLstring) (*sql.DB,error) {`
	`1878`	`+funcConnectToPostgres(ctx context.Context,logger slog.Logger,driverstring,dbURLstring) (sqlDB*sql.DB,errerror) {`
`1879`	`1879`	`logger.Debug(ctx,"connecting to postgresql")`
`1880`	`1880`
`1881`	`1881`	`// Try to connect for 30 seconds.`
`1882`	`1882`	`ctx,cancel:=context.WithTimeout(ctx,30*time.Second)`
`1883`	`1883`	`defercancel()`
`1884`	`1884`
`1885`		`-var (`
`1886`		`-sqlDB*sql.DB`
`1887`		`-errerror`
`1888`		`-ok=false`
`1889`		`-triesint`
`1890`		`-)`
	`1885`	`+deferfunc() {`
	`1886`	`+iferr==nil {`
	`1887`	`+return`
	`1888`	`+}`
	`1889`	`+ifsqlDB!=nil {`
	`1890`	`+_=sqlDB.Close()`
	`1891`	`+sqlDB=nil`
	`1892`	`+}`
	`1893`	`+logger.Error(ctx,"connect to postgres failed",slog.Error(err))`
	`1894`	`+}()`
	`1895`	`+`
	`1896`	`+vartriesint`
`1891`	`1897`	`forr:=retry.New(time.Second,3*time.Second);r.Wait(ctx); {`
`1892`	`1898`	`tries++`
`1893`	`1899`
`1894`	`1900`	`sqlDB,err=sql.Open(driver,dbURL)`
`1895`	`1901`	`iferr!=nil {`
`1896`		`-logger.Warn(ctx,"connect to postgres; retrying",slog.Error(err),slog.F("try",tries))`
	`1902`	`+logger.Warn(ctx,"connect to postgres: retrying",slog.Error(err),slog.F("try",tries))`
`1897`	`1903`	`continue`
`1898`	`1904`	`}`
`1899`	`1905`
`1900`	`1906`	`err=pingPostgres(ctx,sqlDB)`
`1901`	`1907`	`iferr!=nil {`
`1902`		`-logger.Warn(ctx,"ping postgres; retrying",slog.Error(err),slog.F("try",tries))`
	`1908`	`+logger.Warn(ctx,"ping postgres: retrying",slog.Error(err),slog.F("try",tries))`
	`1909`	`+_=sqlDB.Close()`
	`1910`	`+sqlDB=nil`
`1903`	`1911`	`continue`
`1904`	`1912`	`}`
`1905`	`1913`
`1906`	`1914`	`break`
`1907`	`1915`	`}`
`1908`		`-// Make sure we close the DB in case it opened but the ping failed for some`
`1909`		`-// reason.`
`1910`		`-deferfunc() {`
`1911`		`-if!ok&&sqlDB!=nil {`
`1912`		`-_=sqlDB.Close()`
`1913`		`-}`
`1914`		`-}()`
	`1916`	`+iferr==nil {`
	`1917`	`+err=ctx.Err()`
	`1918`	`+}`
`1915`	`1919`	`iferr!=nil {`
`1916`		`-returnnil,xerrors.Errorf("connect topostgres; tries %d; last error: %w",tries,err)`
	`1920`	`+returnnil,xerrors.Errorf("unable toconnect after %d tries; last error: %w",tries,err)`
`1917`	`1921`	`}`
`1918`	`1922`
`1919`	`1923`	`// Ensure the PostgreSQL version is >=13.0.0!`
`@@ -1958,7 +1962,6 @@ func ConnectToPostgres(ctx context.Context, logger slog.Logger, driver string, d`
`1958`	`1962`	`// of connection churn.`
`1959`	`1963`	`sqlDB.SetMaxIdleConns(3)`
`1960`	`1964`
`1961`		`-ok=true`
`1962`	`1965`	`returnsqlDB,nil`
`1963`	`1966`	`}`
`1964`	`1967`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit48ee80a

File tree

1 file changed

1 file changed

`‎cli/server.go`

0 commit comments