Commit4574fbd

authored and

committed

Keep data for disabled nodes

1 parent991a5e2 commit4574fbdCopy full SHA for 4574fbd

File tree

+15

-5

lines changed

+15

-5

lines changed

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -361,9 +361,14 @@ static void MtmAcceptOneConnection()`
`361`	`361`	`close(fd);`
`362`	`362`	`}else{`
`363`	`363`	`Assert(msg.node>0&&msg.node <=MtmNodes&&msg.node!=MtmNodeId);`
`364`		`-elog(NOTICE,"Arbiter established connection with node %d",msg.node);`
`365`		`-MtmRegisterSocket(fd,msg.node-1);`
`366`		`-sockets[msg.node-1]=fd;`
	`364`	`+if (BIT_SET(ds->disabledNodeMask,msg.node-1)) {`
	`365`	`+elog(WARNING,"Reject attempt to reconnect from disabled node %d",msg.node);`
	`366`	`+close(fd);`
	`367`	`+}else {`
	`368`	`+elog(NOTICE,"Arbiter established connection with node %d",msg.node);`
	`369`	`+MtmRegisterSocket(fd,msg.node-1);`
	`370`	`+sockets[msg.node-1]=fd;`
	`371`	`+}`
`367`	`372`	`}`
`368`	`373`	`}`
`369`	`374`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -902,7 +902,7 @@ void MtmDropNode(int nodeId, bool dropSlot)`
`902`	`902`	`}`
`903`	`903`	`if (dropSlot)`
`904`	`904`	`{`
`905`		`-ReplicationSlotDrop(psprintf("mtm_slot_%d",nodeId));`
	`905`	`+ReplicationSlotDrop(psprintf(MULTIMASTER_SLOT_PATTERN,nodeId));`
`906`	`906`	`}`
`907`	`907`	`}`
`908`	`908`	`}`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`#defineMULTIMASTER_NAME "mtm"`
`18`	`18`	`#defineMULTIMASTER_SCHEMA_NAME "mtm"`
`19`	`19`	`#defineMULTIMASTER_DDL_TABLE "ddl_log"`
	`20`	`+#defineMULTIMASTER_SLOT_PATTERN "mtm_slot_%d"`
`20`	`21`
`21`	`22`	`#defineNatts_mtm_ddl_log 2`
`22`	`23`	`#defineAnum_mtm_ddl_log_issued1`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,8 @@`
`39`	`39`	`typedefstructPGLogicalProtoMM`
`40`	`40`	`{`
`41`	`41`	`PGLogicalProtoAPIapi;`
	`42`	`+MtmState*state;`
	`43`	`+intnodeId;`
`42`	`44`	`boolisLocal;`
`43`	`45`	`}PGLogicalProtoMM;`
`44`	`46`
`@@ -106,7 +108,7 @@ pglogical_write_begin(StringInfo out, PGLogicalOutputData *data,`
`106`	`108`	`PGLogicalProtoMMmm= (PGLogicalProtoMM)data->api;`
`107`	`109`	`csn_tcsn=MtmTransactionSnapshot(txn->xid);`
`108`	`110`	`MTM_TRACE("pglogical_write_begin %d CSN=%ld\n",txn->xid,csn);`
`109`		`-if (csn==INVALID_CSN) {`
	`111`	`+if (csn==INVALID_CSN\|\|BIT_SET(mm->state->disabledNodeMask,mm->nodeId-1)) {`
`110`	`112`	`mm->isLocal= true;`
`111`	`113`	`}else {`
`112`	`114`	`mm->isLocal= false;`
`@@ -377,6 +379,8 @@ pglogical_init_api(PGLogicalProtoType typ)`
`377`	`379`	`PGLogicalProtoMM*pmm=palloc0(sizeof(PGLogicalProtoMM));`
`378`	`380`	`PGLogicalProtoAPI*res=&pmm->api;`
`379`	`381`	`pmm->isLocal= false;`
	`382`	`+pmm->state=MtmGetState();`
	`383`	`+sscanf(MyReplicationSlot->data.name.data,MULTIMASTER_SLOT_PATTERN,&pmm->nodeId);`
`380`	`384`	`res->write_rel=pglogical_write_rel;`
`381`	`385`	`res->write_begin=pglogical_write_begin;`
`382`	`386`	`res->write_commit=pglogical_write_commit;`

Comments

(0)