Commitcf0daf4

committed

fix flakes related to context cancellation while establishing postgres connections

1 parent277c2c7 commitcf0daf4Copy full SHA for cf0daf4

File tree

+16

-9

lines changed

+16

-9

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,11 @@ func StartWithAssert(t testing.T, inv serpent.Invocation, assertCallback func(`
`168`	`168`	`switch {`
`169`	`169`	`caseerrors.Is(err,context.Canceled):`
`170`	`170`	`return`
	`171`	`+caseerr!=nil&&strings.Contains(err.Error(),"driver: bad connection"):`
	`172`	`+// When a test exits it cancels the context. If a transaction is open`
	`173`	`+// and a query is being executed, instead of a context.Canceled error`
	`174`	`+// we get a "driver: bad connection" error.`
	`175`	`+return`
`171`	`176`	`default:`
`172`	`177`	`assert.NoError(t,err)`
`173`	`178`	`}`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2359,6 +2359,10 @@ func ConnectToPostgres(ctx context.Context, logger slog.Logger, driver string, d`
`2359`	`2359`	`iferr!=nil {`
`2360`	`2360`	`returnnil,xerrors.Errorf("get postgres version: %w",err)`
`2361`	`2361`	`}`
	`2362`	`+deferversion.Close()`
	`2363`	`+ifversion.Err()!=nil {`
	`2364`	`+returnnil,xerrors.Errorf("version select: %w",version.Err())`
	`2365`	`+}`
`2362`	`2366`	`if!version.Next() {`
`2363`	`2367`	`returnnil,xerrors.Errorf("no rows returned for version select")`
`2364`	`2368`	`}`
`@@ -2367,7 +2371,6 @@ func ConnectToPostgres(ctx context.Context, logger slog.Logger, driver string, d`
`2367`	`2371`	`iferr!=nil {`
`2368`	`2372`	`returnnil,xerrors.Errorf("scan version: %w",err)`
`2369`	`2373`	`}`
`2370`		`-_=version.Close()`
`2371`	`2374`
`2372`	`2375`	`ifversionNum<130000 {`
`2373`	`2376`	`returnnil,xerrors.Errorf("PostgreSQL version must be v13.0.0 or higher! Got: %d",versionNum)`

Lines changed: 7 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -552,15 +552,14 @@ func (p *PGPubsub) startListener(ctx context.Context, connectURL string) error {`
`552`	`552`	`sentErrCh=true`
`553`	`553`	`}),`
`554`	`554`	`}`
`555`		`-select {`
`556`		`-caseerr=<-errCh:`
`557`		`-iferr!=nil {`
`558`		`-_=p.pgListener.Close()`
`559`		`-returnxerrors.Errorf("create pq listener: %w",err)`
`560`		`-}`
`561`		`-case<-ctx.Done():`
	`555`	`+// We don't respect context cancellation here. There's a bug in the pq library`
	`556`	`+// where if you close the listener before or while the connection is being`
	`557`	`+// established, the connection will be established anyway, and will not be`
	`558`	`+// closed.`
	`559`	`+// https://github.com/lib/pq/issues/1192`
	`560`	`+iferr:=<-errCh;err!=nil {`
`562`	`561`	`_=p.pgListener.Close()`
`563`		`-returnctx.Err()`
	`562`	`+returnxerrors.Errorf("create pq listener: %w",err)`
`564`	`563`	`}`
`565`	`564`	`returnnil`
`566`	`565`	`}`

Comments

(0)