Commitbbf83b2

committed

Fix handling of mtm_restart_pos parameter

1 parentfc058eb commitbbf83b2Copy full SHA for bbf83b2

File tree

+10

-1

lines changed

+10

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,7 @@ sub configure`
`108`	`108`	`multimaster.max_nodes = 3`
`109`	`109`	`multimaster.ignore_tables_without_pk = true`
`110`	`110`	`multimaster.twopc_min_timeout = 2000`
	`111`	`+ log_line_prefix = '%t: '`
`111`	`112`	`));`
`112`	`113`
`113`	`114`	`$node->append_conf("pg_hba.conf",qq(`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2680,6 +2680,13 @@ void MtmReceiverStarted(int nodeId)`
`2680`	`2680`	`MtmUnlock();`
`2681`	`2681`	`}`
`2682`	`2682`
	`2683`	`+voidMtmReleaseRecoverySlot(intnodeId)`
	`2684`	`+{`
	`2685`	`+if (Mtm->recoverySlot==nodeId) {`
	`2686`	`+Mtm->recoverySlot=0;`
	`2687`	`+}`
	`2688`	`+}`
	`2689`	`+`
`2683`	`2690`	`/*`
`2684`	`2691`	`* Determine when and how we should open replication slot.`
`2685`	`2692`	`* Druing recovery we need to open only one replication slot from which node should receive all transactions.`
`@@ -2811,7 +2818,6 @@ MtmReplicationStartupHook(struct PGLogicalStartupHookArgs* args)`
`2811`	`2818`	`}else {`
`2812`	`2819`	`elog(ERROR,"Replication mode is not specified");`
`2813`	`2820`	`}`
`2814`		`-break;`
`2815`	`2821`	`}elseif (strcmp("mtm_restart_pos",elem->defname)==0) {`
`2816`	`2822`	`if (elem->arg!=NULL&&strVal(elem->arg)!=NULL) {`
`2817`	`2823`	`recoveryStartPos=intVal(elem->arg);`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -348,6 +348,7 @@ extern bool MtmWatchdog(timestamp_t now);`
`348`	`348`	`externvoidMtmCheckHeartbeat(void);`
`349`	`349`	`externvoidMtmResetTransaction(void);`
`350`	`350`	`externvoidMtmUpdateLockGraph(intnodeId,voidconst*messageBody,intmessageSize);`
	`351`	`+externvoidMtmReleaseRecoverySlot(intnodeId);`
`351`	`352`	`externPGconnPQconnectdb_safe(constcharconninfo);`
`352`	`353`
`353`	`354`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -649,6 +649,7 @@ pglogical_receiver_main(Datum main_arg)`
`649`	`649`
`650`	`650`	`OnError:`
`651`	`651`	`PQfinish(conn);`
	`652`	`+MtmReleaseRecoverySlot(nodeId);`
`652`	`653`	`MtmSleep(RECEIVER_SUSPEND_TIMEOUT);`
`653`	`654`	`}`
`654`	`655`	`ByteBufferFree(&buf);`

Comments

(0)