Commit9bf3fb8

authored and

committed

refresh cluster state in MtmReplicationStartupHook

1 parent11ec4be commit9bf3fb8Copy full SHA for 9bf3fb8

File tree

-5

lines changed

-5

lines changed

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2491,9 +2491,9 @@ MtmReplicationMode MtmGetReplicationMode(int nodeId, sig_atomic_t volatile* shut`
`2491`	`2491`	`MtmSleep(STATUS_POLL_DELAY);`
`2492`	`2492`	`}`
`2493`	`2493`	`if (recovery) {`
`2494`		`-MTM_LOG1("%d: Restart replicationfor node %d after end of recovery",MyProcPid,nodeId);`
	`2494`	`+MTM_LOG1("%d: Restart replicationfrim node %d after end of recovery",MyProcPid,nodeId);`
`2495`	`2495`	`}else {`
`2496`		`-MTM_LOG1("%d: Continue replicationslot for node %d",MyProcPid,nodeId);`
	`2496`	`+MTM_LOG1("%d: Continue replicationfrom node %d",MyProcPid,nodeId);`
`2497`	`2497`	`}`
`2498`	`2498`	`/* After recovery completion we need to drop all other slots to avoid receive of redundant data */`
`2499`	`2499`	`returnrecovery ?REPLMODE_RECOVERED :REPLMODE_NORMAL;`
`@@ -2595,7 +2595,10 @@ MtmReplicationStartupHook(struct PGLogicalStartupHookArgs* args)`
`2595`	`2595`	`MtmCheckQuorum();`
`2596`	`2596`	`}else {`
`2597`	`2597`	`MtmUnlock();`
`2598`		`-elog(ERROR,"Disabled node %d tries to reconnect without recovery",MtmReplicationNodeId);`
	`2598`	`+MtmRefreshClusterStatus(true);`
	`2599`	`+if (BIT_CHECK(Mtm->disabledNodeMask,MtmReplicationNodeId-1)) {`
	`2600`	`+elog(ERROR,"Disabled node %d tries to reconnect without recovery",MtmReplicationNodeId);`
	`2601`	`+}`
`2599`	`2602`	`}`
`2600`	`2603`	`}else {`
`2601`	`2604`	`MTM_LOG1("Node %d start logical replication to node %d in normal mode",MtmNodeId,MtmReplicationNodeId);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -612,7 +612,7 @@ pglogical_receiver_main(Datum main_arg)`
`612`	`612`	`{`
`613`	`613`	`ereport(LOG, (errmsg("%s: COPY Stream has abruptly ended...",`
`614`	`614`	`worker_proc)));`
`615`		`-break;`
	`615`	`+gotoOnError;`
`616`	`616`	`}`
`617`	`617`
`618`	`618`	`/* Failure when reading copy stream, leave */`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@`
`89`	`89`	`diag("polling node 2");`
`90`	`90`	`for (my$poller = 0;$poller < 3;$poller++) {`
`91`	`91`	`my$pollee = 2;`
`92`		`-ok($cluster->poll($poller,'postgres',$pollee,10, 1),"node$pollee is online according to node$poller");`
	`92`	`+ok($cluster->poll($poller,'postgres',$pollee,1000, 1),"node$pollee is online according to node$poller");`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`diag("getting cluster state");`

Comments

(0)