extra check to skip replication after logical message was written to WAL

kelvich · kelvich · commit 2dd95cb81814 · 2016-09-22T12:15:06.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -1660,7 +1660,7 @@ bool MtmRefreshClusterStatus(bool nowait, int testNodeId)
 			/* Interrupt voting for active transaction and abort them */
 			for (ts = Mtm->transListHead; ts != NULL; ts = ts->next) { 
 				MTM_LOG3("Active transaction gid='%s', coordinator=%d, xid=%d, status=%d, gtid.xid=%d",
-						 ts->gid, ts->gtid.nхode, ts->xid, ts->status, ts->gtid.xid);
+						 ts->gid, ts->gtid.node, ts->xid, ts->status, ts->gtid.xid);
 				if (MtmIsCoordinator(ts)) { 
 					if (!ts->votingCompleted && disabled != 0 && ts->status != TRANSACTION_STATUS_ABORTED) {
 						MtmAbortTransaction(ts);
@@ -3826,6 +3826,7 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 	{
 		MTM_LOG1("Xact accessed temp table, stopping replication");
 		MtmTx.isDistributed = false; /* Skip */
+		MtmTx.snapshot = INVALID_CSN;
 	}
 
 }
diff --git a/contrib/mmts/pglogical_proto.c b/contrib/mmts/pglogical_proto.c
@@ -112,12 +112,14 @@ pglogical_write_begin(StringInfo out, PGLogicalOutputData *data,
 	
 	if (!isRecovery && csn == INVALID_CSN) { 
 		MtmIsFilteredTxn = true;
-	} else { 
+		MTM_LOG3("%d: pglogical_write_begin XID=%d filtered", MyProcPid, txn->xid);
+	} else {
+		MTM_LOG3("%d: pglogical_write_begin XID=%d sent", MyProcPid, txn->xid);
+		MtmIsFilteredTxn = false;
 		pq_sendbyte(out, 'B');		/* BEGIN */
 		pq_sendint(out, MtmNodeId, 4);
 		pq_sendint(out, isRecovery ? InvalidTransactionId : txn->xid, 4);
 		pq_sendint64(out, csn);
-		MtmIsFilteredTxn = false;
 		MtmTransactionRecords = 0;
 	}
 }
@@ -126,6 +128,12 @@ static void
 pglogical_write_message(StringInfo out,
 					const char *prefix, Size sz, const char *message)
 {
+	if (MtmIsFilteredTxn)
+	{
+		MTM_LOG3("%d: pglogical_write_message filtered", MyProcPid);
+		return;
+	}
+
 	pq_sendbyte(out, 'G');
 	pq_sendbytes(out, message, sz);
 	pq_sendbyte(out, '\0');

Original file line number	Diff line number	Diff line change
`@@ -1660,7 +1660,7 @@ bool MtmRefreshClusterStatus(bool nowait, int testNodeId)`
`1660`	`1660`	`/* Interrupt voting for active transaction and abort them */`
`1661`	`1661`	`for (ts = Mtm->transListHead; ts != NULL; ts = ts->next) {`
`1662`	`1662`	`MTM_LOG3("Active transaction gid='%s', coordinator=%d, xid=%d, status=%d, gtid.xid=%d",`
`1663`		`- ts->gid, ts->gtid.nхode, ts->xid, ts->status, ts->gtid.xid);`
	`1663`	`+ ts->gid, ts->gtid.node, ts->xid, ts->status, ts->gtid.xid);`
`1664`	`1664`	`if (MtmIsCoordinator(ts)) {`
`1665`	`1665`	`if (!ts->votingCompleted && disabled != 0 && ts->status != TRANSACTION_STATUS_ABORTED) {`
`1666`	`1666`	`MtmAbortTransaction(ts);`
`@@ -3826,6 +3826,7 @@ static void MtmProcessUtility(Node parsetree, const char queryString,`
`3826`	`3826`	`{`
`3827`	`3827`	`MTM_LOG1("Xact accessed temp table, stopping replication");`
`3828`	`3828`	`MtmTx.isDistributed = false; /* Skip */`
	`3829`	`+ MtmTx.snapshot = INVALID_CSN;`
`3829`	`3830`	`}`
`3830`	`3831`
`3831`	`3832`	`}`