Commit4c57b00

committed

Cleanup disconnected bit for recovered node

1 parentdd875d8 commit4c57b00Copy full SHA for 4c57b00

File tree

+45

-8

lines changed

+45

-8

lines changed

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -842,8 +842,9 @@ void MtmSendNotificationMessage(MtmTransState* ts, MtmMessageCode cmd)`
`842`	`842`
`843`	`843`	`voidMtmRecoveryCompleted(void)`
`844`	`844`	`{`
`845`		`-elog(WARNING,"Recevoery of node %d is completed",MtmNodeId);`
	`845`	`+elog(WARNING,"Recovery of node %d is completed",MtmNodeId);`
`846`	`846`	`Mtm->recoverySlot=0;`
	`847`	`+BIT_CLEAR(Mtm->disabledNodeMask,MtmNodeId-1);`
`847`	`848`	`MtmSwitchClusterMode(MTM_ONLINE);`
`848`	`849`	`}`
`849`	`850`
`@@ -1745,10 +1746,6 @@ MtmReplicationStartupHook(struct PGLogicalStartupHookArgs* args)`
`1745`	`1746`	`break;`
`1746`	`1747`	`}`
`1747`	`1748`	`}`
`1748`		`-if (isRecoverySession) {`
`1749`		`-MTM_INFO("%d: PGLOGICAL startup hook\n",MyProcPid);`
`1750`		`-sleep(30);`
`1751`		`-}`
`1752`	`1749`	`MtmLock(LW_EXCLUSIVE);`
`1753`	`1750`	`if (isRecoverySession) {`
`1754`	`1751`	`elog(WARNING,"Node %d start recovery of node %d",MtmNodeId,MtmReplicationNodeId);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ static volatile sig_atomic_t got_sighup = false;`
`53`	`53`
`54`	`54`	`/* GUC variables */`
`55`	`55`	`staticintreceiver_idle_time=0;`
`56`		`-staticboolreceiver_sync_mode=false;`
	`56`	`+staticboolreceiver_sync_mode=true;`
`57`	`57`
`58`	`58`	`/* Worker name */`
`59`	`59`	`charworker_proc[BGW_MAXLEN];`
`@@ -292,7 +292,7 @@ pglogical_receiver_main(Datum main_arg)`
`292`	`292`	`}`
`293`	`293`	`CommitTransactionCommand();`
`294`	`294`
`295`		`-appendPQExpBuffer(query,"START_REPLICATION SLOT \"%s\" LOGICAL %u/%u (\"startup_params_format\" '1', \"max_proto_version\" '%d', \"min_proto_version\" '%d', \"mtm_replication_mode\" '%s')",`
	`295`	`+appendPQExpBuffer(query,"START_REPLICATION SLOT \"%s\" LOGICAL %u/%u (\"startup_params_format\" '1', \"max_proto_version\" '%d', \"min_proto_version\" '%d', \"forward_changesets\" '1', \"mtm_replication_mode\" '%s')",`
`296`	`296`	`args->receiver_slot,`
`297`	`297`	`(uint32) (originStartPos >>32),`
`298`	`298`	`(uint32)originStartPos,`

Lines changed: 38 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,38 @@`
	`1`	`+#include<dlfcn.h>`
	`2`	`+#include"postgres.h"`
	`3`	`+#include"raftable.h"`
	`4`	`+`
	`5`	`+`
	`6`	`+staticraftable_get_traftable_get_impl;`
	`7`	`+staticraftable_set_traftable_set_impl;`
	`8`	`+`
	`9`	`+staticvoidRaftableResolve()`
	`10`	`+{`
	`11`	`+if (raftable_get_impl==NULL) {`
	`12`	`+void*dll=dlopen(NULL,RTLD_NOW);`
	`13`	`+raftable_get_impl=dlsym(dll,"raftable_get");`
	`14`	`+raftable_set_impl=dlsym(dll,"raftable_set");`
	`15`	`+Assert(raftable_get_impl!=NULL&&raftable_set_impl!=NULL);`
	`16`	`+}`
	`17`	`+}`
	`18`	`+`
	`19`	`+/*`
	`20`	`+ * Raftable function proxies`
	`21`	`+ */`
	`22`	`+voidRaftableGet(charconstkey,intsize,RaftableTimestampts,boolnowait)`
	`23`	`+{`
	`24`	`+if (!MtmUseRaftable) {`
	`25`	`+returnNULL;`
	`26`	`+}`
	`27`	`+RaftableResolve();`
	`28`	`+return (*raftable_get_impl)(key,size,nowait ?0 :-1);`
	`29`	`+}`
	`30`	`+`
	`31`	`+`
	`32`	`+voidRaftableSet(charconstkey,voidconstvalue,intsize,boolnowait)`
	`33`	`+{`
	`34`	`+if (MtmUseRaftable) {`
	`35`	`+RaftableResolve();`
	`36`	`+(*raftable_set_impl)(key,value,size,nowait ?0 :-1);`
	`37`	`+}`
	`38`	`+}`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -992,6 +992,8 @@ StartLogicalReplication(StartReplicationCmd *cmd)`
`992`	`992`	`* Initialize position to the last ack'ed one, then the xlog records begin`
`993`	`993`	`* to be shipped from that position.`
`994`	`994`	`*/`
	`995`	`+elog(WARNING,"%d: StartLogicalReplication for slot %s startpoint %lx",MyProcPid,NameStr(MyReplicationSlot->data.name),cmd->startpoint);`
	`996`	`+`
`995`	`997`	`logical_decoding_ctx=CreateDecodingContext(`
`996`	`998`	`cmd->startpoint,cmd->options,`
`997`	`999`	`logical_read_xlog_page,`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ do { \`
`114`	`114`
`115`	`115`	`#defineRESUME_INTERRUPTS() \`
`116`	`116`	`do { \`
`117`		`-Assert(InterruptHoldoffCount> 0);\`
	`117`	`+if(InterruptHoldoffCount<= 0) (int)0 = 0;\`
`118`	`118`	`InterruptHoldoffCount--; \`
`119`	`119`	`} while(0)`
`120`	`120`

Comments

(0)