Commitdc3e86c

authored and

committed

Avoid hanging on exit in pglogical_receiver

1 parentf8c7308 commitdc3e86cCopy full SHA for dc3e86c

File tree

+15

-8

lines changed

+15

-8

lines changed

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2331,10 +2331,16 @@ void MtmReceiverStarted(int nodeId)`
`2331`	`2331`	`* Druing recovery we need to open only one replication slot from which node should receive all transactions.`
`2332`	`2332`	`* Slots at other nodes should be removed`
`2333`	`2333`	`*/`
`2334`		`-MtmReplicationModeMtmGetReplicationMode(intnodeId)`
	`2334`	`+MtmReplicationModeMtmGetReplicationMode(intnodeId,sig_atomic_tvolatile*shutdown)`
`2335`	`2335`	`{`
`2336`	`2336`	`boolrecovery= false;`
`2337`		`-if (Mtm->status!=MTM_CONNECTED&&Mtm->status!=MTM_ONLINE) {`
	`2337`	`+`
	`2338`	`+while (Mtm->status!=MTM_CONNECTED&&Mtm->status!=MTM_ONLINE)`
	`2339`	`+{`
	`2340`	`+if (*shutdown)`
	`2341`	`+{`
	`2342`	`+returnREPLMODE_EXIT;`
	`2343`	`+}`
`2338`	`2344`	`MTM_LOG2("%d: receiver slot mode %s",MyProcPid,MtmNodeStatusMnem[Mtm->status]);`
`2339`	`2345`	`if (Mtm->status==MTM_RECOVERY) {`
`2340`	`2346`	`recovery= true;`
`@@ -2351,7 +2357,6 @@ MtmReplicationMode MtmGetReplicationMode(int nodeId)`
`2351`	`2357`	`}`
`2352`	`2358`	`/* delay opening of other slots until recovery is completed */`
`2353`	`2359`	`MtmSleep(STATUS_POLL_DELAY);`
`2354`		`-returnREPLMODE_UNKNOWN;`
`2355`	`2360`	`}`
`2356`	`2361`	`if (recovery) {`
`2357`	`2362`	`MTM_LOG1("Recreate replication slot for node %d after end of recovery",nodeId);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ typedef enum`
`117`	`117`
`118`	`118`	`typedefenum`
`119`	`119`	`{`
`120`		`-REPLMODE_UNKNOWN,/* receiver shouldwait */`
	`120`	`+REPLMODE_EXIT,/* receiver shouldexit */`
`121`	`121`	`REPLMODE_RECOVERED,/* recovery of node is completed so drop old slot and restart replication from the current position in WAL */`
`122`	`122`	`REPLMODE_RECOVERY,/* perform recorvery of the node by applying all data from the slot from specified point */`
`123`	`123`	`REPLMODE_NORMAL/* normal mode: use existed slot or create new one and start receiving data from it from the specified position */`
`@@ -245,7 +245,7 @@ extern csn_t MtmAssignCSN(void);`
`245`	`245`	`externcsn_tMtmSyncClock(csn_tcsn);`
`246`	`246`	`externvoidMtmJoinTransaction(GlobalTransactionId*gtid,csn_tsnapshot);`
`247`	`247`	`externvoidMtmReceiverStarted(intnodeId);`
`248`		`-externMtmReplicationModeMtmGetReplicationMode(intnodeId);`
	`248`	`+externMtmReplicationModeMtmGetReplicationMode(intnodeId,sig_atomic_tvolatile*shutdown);`
`249`	`249`	`externvoidMtmExecute(void*work,intsize);`
`250`	`250`	`externvoidMtmExecutor(intid,void*work,size_tsize);`
`251`	`251`	`externvoidMtmSendNotificationMessage(MtmTransState*ts,MtmMessageCodecmd);`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,7 @@ feTimestampDifference(int64 start_time, int64 stop_time,`
`193`	`193`
`194`	`194`	`staticcharconst*constMtmReplicationModeName[]=`
`195`	`195`	`{`
	`196`	`+"exit",`
`196`	`197`	`"recovered",/* recovery of node is completed so drop old slot and restart replication from the current position in WAL */`
`197`	`198`	`"recovery",/* perform recorvery of the node by applying all data from theslot from specified point */`
`198`	`199`	`"normal"/* normal mode: use existed slot or create new one and start receiving data from it from the specified position */`
`@@ -251,9 +252,10 @@ pglogical_receiver_main(Datum main_arg)`
`251`	`252`	`* Druing recovery we need to open only one replication slot from which node should receive all transactions.`
`252`	`253`	`* Slots at other nodes should be removed`
`253`	`254`	`*/`
`254`		`-mode=MtmGetReplicationMode(nodeId);`
`255`		`-if (mode==REPLMODE_UNKNOWN) {`
`256`		`-continue;`
	`255`	`+mode=MtmGetReplicationMode(nodeId,&got_sigterm);`
	`256`	`+if (mode==REPLMODE_EXIT)`
	`257`	`+{`
	`258`	`+break;`
`257`	`259`	`}`
`258`	`260`	`count=Mtm->recoveryCount;`
`259`	`261`

Comments

(0)