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

Commit387723a

authored

fix: close pg PubSub listener to avoid race (#11640)

Fixes flake as seen here:https://github.com/coder/coder/runs/20528529187

1 parent72d9ec0 commit387723aCopy full SHA for 387723a

File tree

2 files changed

+26

-10

lines changed

coderd/database/pubsub
- pubsub.go
helm/provisioner/charts
- libcoder-0.1.0.tgz

2 files changed

+26

-10

lines changed

`‎coderd/database/pubsub/pubsub.go`

Lines changed: 26 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -162,13 +162,15 @@ func (q *msgQueue) dropped() {`
`162`	`162`
`163`	`163`	`// Pubsub implementation using PostgreSQL.`
`164`	`164`	`typepgPubsubstruct {`
`165`		`-ctx context.Context`
`166`		`-cancel context.CancelFunc`
`167`		`-listenDonechanstruct{}`
`168`		`-pgListener*pq.Listener`
`169`		`-db*sql.DB`
`170`		`-mut sync.Mutex`
`171`		`-queuesmap[string]map[uuid.UUID]*msgQueue`
	`165`	`+ctx context.Context`
	`166`	`+cancel context.CancelFunc`
	`167`	`+listenDonechanstruct{}`
	`168`	`+pgListener*pq.Listener`
	`169`	`+db*sql.DB`
	`170`	`+mut sync.Mutex`
	`171`	`+queuesmap[string]map[uuid.UUID]*msgQueue`
	`172`	`+closedListenerbool`
	`173`	`+closeListenerErrerror`
`172`	`174`	`}`
`173`	`175`
`174`	`176`	`// BufferSize is the maximum number of unhandled messages we will buffer`
`@@ -240,15 +242,29 @@ func (p *pgPubsub) Publish(event string, message []byte) error {`
`240`	`242`	`// Close closes the pubsub instance.`
`241`	`243`	`func (p*pgPubsub)Close()error {`
`242`	`244`	`p.cancel()`
`243`		`-err:=p.pgListener.Close()`
	`245`	`+err:=p.closeListener()`
`244`	`246`	`<-p.listenDone`
`245`	`247`	`returnerr`
`246`	`248`	`}`
`247`	`249`
	`250`	`+// closeListener closes the pgListener, unless it has already been closed.`
	`251`	`+func (p*pgPubsub)closeListener()error {`
	`252`	`+p.mut.Lock()`
	`253`	`+deferp.mut.Unlock()`
	`254`	`+ifp.closedListener {`
	`255`	`+returnp.closeListenerErr`
	`256`	`+}`
	`257`	`+p.closeListenerErr=p.pgListener.Close()`
	`258`	`+p.closedListener=true`
	`259`	`+returnp.closeListenerErr`
	`260`	`+}`
	`261`	`+`
`248`	`262`	`// listen begins receiving messages on the pq listener.`
`249`	`263`	`func (p*pgPubsub)listen() {`
`250`		`-deferclose(p.listenDone)`
`251`		`-deferp.pgListener.Close()`
	`264`	`+deferfunc() {`
	`265`	`+_=p.closeListener()`
	`266`	`+close(p.listenDone)`
	`267`	`+}()`
`252`	`268`
`253`	`269`	`var (`
`254`	`270`	`notif*pq.Notification`

`‎helm/provisioner/charts/libcoder-0.1.0.tgz`

-3 Bytes

Binary file not shown.

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!

Commit387723a

File tree

2 files changed

2 files changed

`‎coderd/database/pubsub/pubsub.go`

`‎helm/provisioner/charts/libcoder-0.1.0.tgz`

0 commit comments