NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commita5a02a7

committed

Fix the logic in libpqrcv_receive() to determine if there's any incoming data

that can be read without blocking. It used to conclude that there isn't, eventhough there was data in the socket receive buffer. That lead walreceiver toflush the WAL after every received chunk, potentially causing big performanceissues.Backpatch to 9.0, because the performance impact can be very significant.

1 parentc667cc2 commita5a02a7Copy full SHA for a5a02a7

File tree

1 file changed

+17

-18

lines changed

src/backend/replication/libpqwalreceiver
- libpqwalreceiver.c

1 file changed

+17

-18

lines changed

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

Lines changed: 17 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ void_PG_init(void);`
`41`	`41`
`42`	`42`	`/* Current connection to the primary, if any */`
`43`	`43`	`staticPGconn*streamConn=NULL;`
`44`		`-staticbooljustconnected= false;`
`45`	`44`
`46`	`45`	`/* Buffer for currently read records */`
`47`	`46`	`staticchar*recvBuf=NULL;`
`@@ -168,7 +167,6 @@ libpqrcv_connect(char *conninfo, XLogRecPtr startpoint)`
`168`	`167`	`}`
`169`	`168`	`PQclear(res);`
`170`	`169`
`171`		`-justconnected= true;`
`172`	`170`	`ereport(LOG,`
`173`	`171`	`(errmsg("streaming replication successfully connected to primary")));`
`174`	`172`
`@@ -321,7 +319,6 @@ libpqrcv_disconnect(void)`
`321`	`319`	`{`
`322`	`320`	`PQfinish(streamConn);`
`323`	`321`	`streamConn=NULL;`
`324`		`-justconnected= false;`
`325`	`322`	`}`
`326`	`323`
`327`	`324`	`/*`
`@@ -351,28 +348,30 @@ libpqrcv_receive(int timeout, unsigned char type, char buffer, int len)`
`351`	`348`	`PQfreemem(recvBuf);`
`352`	`349`	`recvBuf=NULL;`
`353`	`350`
`354`		`-/*`
`355`		`- * If the caller requested to block, wait for data to arrive. But if this`
`356`		`- * is the first call after connecting, don't wait, because there might`
`357`		`- * already be some data in libpq buffer that we haven't returned to`
`358`		`- * caller.`
`359`		`- */`
`360`		`-if (timeout>0&& !justconnected)`
	`351`	`+/* Try to receive a CopyData message */`
	`352`	`+rawlen=PQgetCopyData(streamConn,&recvBuf,1);`
	`353`	`+if (rawlen==0)`
`361`	`354`	`{`
`362`		`-if (!libpq_select(timeout))`
`363`		`-return false;`
	`355`	`+/*`
	`356`	`+ * No data available yet. If the caller requested to block, wait for`
	`357`	`+ * more data to arrive.`
	`358`	`+ */`
	`359`	`+if (timeout>0)`
	`360`	`+{`
	`361`	`+if (!libpq_select(timeout))`
	`362`	`+return false;`
	`363`	`+}`
`364`	`364`
`365`	`365`	`if (PQconsumeInput(streamConn)==0)`
`366`	`366`	`ereport(ERROR,`
`367`	`367`	`(errmsg("could not receive data from WAL stream: %s",`
`368`	`368`	`PQerrorMessage(streamConn))));`
`369`		`-}`
`370`		`-justconnected= false;`
`371`	`369`
`372`		`-/* Receive CopyData message */`
`373`		`-rawlen=PQgetCopyData(streamConn,&recvBuf,1);`
`374`		`-if (rawlen==0)/* no data available yet, then return */`
`375`		`-return false;`
	`370`	`+/* Now that we've consumed some input, try again */`
	`371`	`+rawlen=PQgetCopyData(streamConn,&recvBuf,1);`
	`372`	`+if (rawlen==0)`
	`373`	`+return false;`
	`374`	`+}`
`376`	`375`	`if (rawlen==-1)/* end-of-streaming or error */`
`377`	`376`	`{`
`378`	`377`	`PGresult*res;`

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!

Commita5a02a7

File tree

1 file changed

1 file changed

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

0 commit comments