NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit9b8a851

committed

Fix over-eager ping'ing in logical replication receiver.

Commit3f60f69 only partially fixed the broken-status-trackingissue in LogicalRepApplyLoop: we need ping_sent to have the samelifetime as last_recv_timestamp. The effects are much less seriousthan what that commit fixed, though. AFAICS this would just lead toextra ping requests being sent, once per second until the senderresponds. Still, it's a bug, so backpatch to v10 as before.Discussion:https://postgr.es/m/959627.1599248476@sss.pgh.pa.us

1 parent63abf9a commit9b8a851Copy full SHA for 9b8a851

File tree

1 file changed

-6

lines changed

src/backend/replication/logical
- worker.c

1 file changed

-6

lines changed

`‎src/backend/replication/logical/worker.c‎`

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1077,6 +1077,7 @@ static void`
`1077`	`1077`	`LogicalRepApplyLoop(XLogRecPtrlast_received)`
`1078`	`1078`	`{`
`1079`	`1079`	`TimestampTzlast_recv_timestamp=GetCurrentTimestamp();`
	`1080`	`+boolping_sent= false;`
`1080`	`1081`
`1081`	`1082`	`/*`
`1082`	`1083`	`* Init the ApplyMessageContext which we clean up after each replication`
`@@ -1089,14 +1090,14 @@ LogicalRepApplyLoop(XLogRecPtr last_received)`
`1089`	`1090`	`/* mark as idle, before starting to loop */`
`1090`	`1091`	`pgstat_report_activity(STATE_IDLE,NULL);`
`1091`	`1092`
	`1093`	`+/* This outer loop iterates once per wait. */`
`1092`	`1094`	`for (;;)`
`1093`	`1095`	`{`
`1094`	`1096`	`pgsocketfd=PGINVALID_SOCKET;`
`1095`	`1097`	`intrc;`
`1096`	`1098`	`intlen;`
`1097`	`1099`	`char*buf=NULL;`
`1098`	`1100`	`boolendofstream= false;`
`1099`		`-boolping_sent= false;`
`1100`	`1101`	`longwait_time;`
`1101`	`1102`
`1102`	`1103`	`CHECK_FOR_INTERRUPTS();`
`@@ -1107,7 +1108,7 @@ LogicalRepApplyLoop(XLogRecPtr last_received)`
`1107`	`1108`
`1108`	`1109`	`if (len!=0)`
`1109`	`1110`	`{`
`1110`		`-/Process thedata /`
	`1111`	`+/Loop to process all availabledata (without blocking). /`
`1111`	`1112`	`for (;;)`
`1112`	`1113`	`{`
`1113`	`1114`	`CHECK_FOR_INTERRUPTS();`
`@@ -1280,10 +1281,7 @@ LogicalRepApplyLoop(XLogRecPtr last_received)`
`1280`	`1281`	`ereport(ERROR,`
`1281`	`1282`	`(errmsg("terminating logical replication worker due to timeout")));`
`1282`	`1283`
`1283`		`-/*`
`1284`		`- * We didn't receive anything new, for half of receiver`
`1285`		`- * replication timeout. Ping the server.`
`1286`		`- */`
	`1284`	`+/* Check to see if it's time for a ping. */`
`1287`	`1285`	`if (!ping_sent)`
`1288`	`1286`	`{`
`1289`	`1287`	`timeout=TimestampTzPlusMilliseconds(last_recv_timestamp,`

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!

Commit9b8a851

File tree

1 file changed

1 file changed

`‎src/backend/replication/logical/worker.c‎`

0 commit comments