nik/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2026-10-18 07:30:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(pglite): never leave a client without ReadyForQuery

Browse Source 
When the backend produced no bytes for a request, or a reply without
ReadyForQuery, the bridge forwarded it as-is and the client waited for
ever while the session was free. On roy this froze the UI: a pooled
connection hung right after its handshake and every request queued in
the pool behind it. Incomplete replies now get a synthesized error plus
ReadyForQuery, and the bridge logs them, so a glitch becomes a visible
SQL error that the pool can retry.
This commit is contained in:
Deluan 2026-09-04 23:17:48 -04:00
parent 63e7fe0925
commit 75e14f14d6
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
db/pglite/pglite.go
View File

@ -468,7 +468,11 @@ func (pg *PGlite) handleConn(conn net.Conn, ioBase string) {
if !handshakeDone {
replies, handshakeDone = pg.fixHandshake(replies)
} else {
replies = ensureReadyForQuery(replies, trapErr)
fixed := ensureReadyForQuery(replies, trapErr)
if len(fixed) != len(replies) {
fmt.Fprintf(pg.cfg.Stderr, "# bridge: incomplete reply to %s (trap=%v); synthesized error+ReadyForQuery\n", wireTags(packet), trapErr != nil)
}
replies = fixed
}
if trapErr != nil && pg.trace {
fmt.Fprintf(pg.cfg.Stderr, "# bridge: trap recovered: %v\n", strings.SplitN(trapErr.Error(), "\n", 2)[0])
@ -766,9 +770,6 @@ func (pg *PGlite) fixHandshake(replies [][]byte) ([][]byte, bool) {
// which would otherwise leave the client waiting forever.
func ensureReadyForQuery(replies [][]byte, trapErr error) [][]byte {
data := bytes.Join(replies, nil)
if len(data) == 0 && trapErr == nil {
return replies
}
sawError, sawReady := false, false
for rest := data; len(rest) >= 5; {
n := int(rest[1])<<24 | int(rest[2])<<16 | int(rest[3])<<8 | int(rest[4])
@ -783,14 +784,18 @@ func ensureReadyForQuery(replies [][]byte, trapErr error) [][]byte {
}
rest = rest[n+1:]
}
if trapErr != nil && !sawError && !sawReady {
replies = append(replies, errorResponse("XX000", "pglite trap: "+strings.SplitN(trapErr.Error(), "\n", 2)[0]))
sawError = true
if sawReady {
return replies
}
if sawError && !sawReady {
return append(replies, []byte{'Z', 0, 0, 0, 5, 'I'})
// A reply without ReadyForQuery would leave the client waiting forever; fail it instead.
if !sawError {
msg := "pglite: incomplete reply from the backend"
if trapErr != nil {
msg = "pglite trap: " + strings.SplitN(trapErr.Error(), "\n", 2)[0]
}
replies = append(replies, errorResponse("XX000", msg))
}
return replies
return append(replies, []byte{'Z', 0, 0, 0, 5, 'I'})
}
func errorResponse(code, msg string) []byte {