Skip to content

Commit

Permalink
Revert "CancelRequest: don't try to read the reply"
Browse files Browse the repository at this point in the history
This reverts commit c861bce.
  • Loading branch information
levakin authored and jackc committed Oct 14, 2023
1 parent 81ddcfd commit 6ca3d8e
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions pgconn/pgconn.go
Original file line number Diff line number Diff line change
Expand Up @@ -944,11 +944,17 @@ func (pgConn *PgConn) CancelRequest(ctx context.Context) error {
binary.BigEndian.PutUint32(buf[4:8], 80877102)
binary.BigEndian.PutUint32(buf[8:12], uint32(pgConn.pid))
binary.BigEndian.PutUint32(buf[12:16], uint32(pgConn.secretKey))
// Postgres will process the request and close the connection
// so when don't need to read the reply
// https://www.postgresql.org/docs/current/protocol-flow.html#id-1.10.6.7.10
_, err = cancelConn.Write(buf)
return err
if err != nil {
return err
}

_, err = cancelConn.Read(buf)
if err != io.EOF {
return err
}

return nil
}

// WaitForNotification waits for a LISTON/NOTIFY message to be received. It returns an error if a notification was not
Expand Down

0 comments on commit 6ca3d8e

Please sign in to comment.