Skip to content

Fix data race in Postgres engine on connection close #32650

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
Tener merged 2 commits into from
Sep 29, 2023
Merged

Fix data race in Postgres engine on connection close #32650

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e572f8
Fix data race in Postgres engine.
Tener Sep 27, 2023
34d4806
Use channel instead of `sync.WaitGroup`.
Tener Sep 28, 2023
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
5 changes: 5 additions & 0 deletions lib/srv/db/postgres/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,8 +418,11 @@ func (e *Engine) receiveFromServer(serverConn *pgconn.PgConn, serverErrCh chan<-
copyReader, copyWriter := io.Pipe()
defer copyWriter.Close()

closeChan := make(chan struct{})

go func() {
defer copyReader.Close()
defer close(closeChan)

// server will never be used to write to server,
// which is why we pass io.Discard instead of e.rawServerConn
Expand Down Expand Up @@ -455,6 +458,8 @@ func (e *Engine) receiveFromServer(serverConn *pgconn.PgConn, serverErrCh chan<-
log.WithError(err).Warn("Server -> Client copy finished with unexpected error.")
}

<-closeChan

serverErrCh <- trace.Wrap(err)
log.Debugf("Stopped receiving from server. Transferred %v bytes.", total)
}
Expand Down