NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit5fd56b9

committed

Again report a useful error message when walreceiver's connection closes.

Since7c4f524 (merged in v10), a shutdown master is reported as FATAL: unexpected result after CommandComplete: server closed the connection unexpectedlyby walsender. It used to be LOG: replication terminated by primary server FATAL: could not send end-of-streaming message to primary: no COPY in progresswhile the old message clearly is not perfect, it's definitely betterthan what's reported now.The change comes from the attempt to handle finished COPYs withouterroring out, needed for the new logical replication, which wasn'tneeded before.There's probably better ways to handle this, but for now justexplicitly check for a closed connection.Author: Petr JelinekReviewed-By: Andres FreundDiscussion:https://postgr.es/m/f7c7dd08-855c-e4ed-41f4-d064a6c0665a@2ndquadrant.comBackpatch: -

1 parent5c4109f commit5fd56b9Copy full SHA for 5fd56b9

File tree

1 file changed

+14

-1

lines changed

src/backend/replication/libpqwalreceiver
- libpqwalreceiver.c

1 file changed

+14

-1

lines changed

`‎src/backend/replication/libpqwalreceiver/libpqwalreceiver.c`

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -682,12 +682,25 @@ libpqrcv_receive(WalReceiverConn conn, char *buffer,`
`682`	`682`	`{`
`683`	`683`	`PQclear(res);`
`684`	`684`
`685`		`-/* Verify that there are no more results */`
	`685`	`+/* Verify that there are no more results. */`
`686`	`686`	`res=PQgetResult(conn->streamConn);`
`687`	`687`	`if (res!=NULL)`
	`688`	`+{`
	`689`	`+PQclear(res);`
	`690`	`+`
	`691`	`+/*`
	`692`	`+ * If the other side closed the connection orderly (otherwise`
	`693`	`+ * we'd seen an error, or PGRES_COPY_IN) don't report an error`
	`694`	`+ * here, but let callers deal with it.`
	`695`	`+ */`
	`696`	`+if (PQstatus(conn->streamConn)==CONNECTION_BAD)`
	`697`	`+return-1;`
	`698`	`+`
`688`	`699`	`ereport(ERROR,`
`689`	`700`	`(errmsg("unexpected result after CommandComplete: %s",`
`690`	`701`	`PQerrorMessage(conn->streamConn))));`
	`702`	`+}`
	`703`	`+`
`691`	`704`	`return-1;`
`692`	`705`	`}`
`693`	`706`	`elseif (PQresultStatus(res)==PGRES_COPY_IN)`

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!

Commit5fd56b9

File tree

1 file changed

1 file changed

`‎src/backend/replication/libpqwalreceiver/libpqwalreceiver.c`

0 commit comments