Commitaface56

authored and

committed

Undo changes around MtmRecoveryCaughtUp

1 parent50a052c commitaface56Copy full SHA for aface56

File tree

-9

lines changed

-9

lines changed

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -996,7 +996,6 @@ bool MtmRecoveryCaughtUp(int nodeId, XLogRecPtr slotLSN)`
`996`	`996`	`if (MtmIsRecoveredNode(nodeId)) {`
`997`	`997`	`XLogRecPtrwalLSN=GetXLogInsertRecPtr();`
`998`	`998`	`MtmLock(LW_EXCLUSIVE);`
`999`		`-#if0`
`1000`	`999`	`if (slotLSN==walLSN) {`
`1001`	`1000`	`if (BIT_CHECK(Mtm->nodeLockerMask,nodeId-1)) {`
`1002`	`1001`	`elog(WARNING,"Node %d is caught-up",nodeId);`
`@@ -1010,9 +1009,7 @@ bool MtmRecoveryCaughtUp(int nodeId, XLogRecPtr slotLSN)`
`1010`	`1009`	`BIT_CLEAR(Mtm->disabledNodeMask,nodeId-1);`
`1011`	`1010`	`Mtm->nNodes+=1;`
`1012`	`1011`	`caughtUp= true;`
`1013`		`-}else`
`1014`		`-#endif`
`1015`		`-if (!BIT_CHECK(Mtm->nodeLockerMask,nodeId-1)`
	`1012`	`+}elseif (!BIT_CHECK(Mtm->nodeLockerMask,nodeId-1)`
`1016`	`1013`	`&&slotLSN+MtmMinRecoveryLag>walLSN)`
`1017`	`1014`	`{`
`1018`	`1015`	`/*`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -497,12 +497,12 @@ process_remote_commit(StringInfo in)`
`497`	`497`	`uint8flags;`
`498`	`498`	`csn_tcsn;`
`499`	`499`	`constchar*gid=NULL;`
`500`		`-boolcaughtUp= false;`
	`500`	`+boolcaughtUp;`
`501`	`501`
`502`	`502`	`/* read flags */`
`503`	`503`	`flags=pq_getmsgbyte(in);`
`504`	`504`	`MtmReplicationNode=pq_getmsgbyte(in);`
`505`		`-/caughtUp = pq_getmsgbyte(in) != 0;/`
	`505`	`+caughtUp=pq_getmsgbyte(in)!=0;`
`506`	`506`
`507`	`507`	`/* read fields */`
`508`	`508`	`replorigin_session_origin_lsn=pq_getmsgint64(in);/* commit_lsn */`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -147,16 +147,14 @@ pglogical_write_commit(StringInfo out, PGLogicalOutputData *data,`
`147`	`147`	`return;`
`148`	`148`	`}`
`149`	`149`	`}`
`150`		`-MtmRecoveryCaughtUp(MtmReplicationNodeId,txn->end_lsn);`
`151`		`-`
`152`	`150`	`pq_sendbyte(out,'C');/* sending COMMIT */`
`153`	`151`
`154`	`152`	`MTM_INFO("PGLOGICAL_SEND commit: event=%d, gid=%s, commit_lsn=%lx, txn->end_lsn=%lx, xlog=%lx\n",flags,txn->gid,commit_lsn,txn->end_lsn,GetXLogInsertRecPtr());`
`155`	`153`
`156`	`154`	`/* send the flags field */`
`157`	`155`	`pq_sendbyte(out,flags);`
`158`	`156`	`pq_sendbyte(out,MtmNodeId);`
`159`		`-/pq_sendbyte(out, MtmRecoveryCaughtUp(MtmReplicationNodeId, txn->end_lsn));/`
	`157`	`+pq_sendbyte(out,MtmRecoveryCaughtUp(MtmReplicationNodeId,txn->end_lsn));`
`160`	`158`
`161`	`159`	`/* send fixed fields */`
`162`	`160`	`pq_sendint64(out,commit_lsn);`

Comments

(0)