Fix bugs in 3PC implementation

knizhnik · kelvich · commit 215fbb1bfcce · 2017-11-13T02:17:34.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -1311,6 +1311,7 @@ void MtmSend2PCMessage(MtmTransState* ts, MtmMessageCode cmd)
 
 	if (MtmIsCoordinator(ts)) {
 		int i;
+		Assert(false); // All broadcasts are now done through logical decoding
 		for (i = 0; i < Mtm->nAllNodes; i++)
 		{
 			if (BIT_CHECK(ts->participantsMask & ~Mtm->disabledNodeMask & ~ts->votedMask, i))
@@ -3228,9 +3229,10 @@ bool MtmFilterTransaction(char* record, int size)
 		   origin_node != 0 &&
 		   (Mtm->status == MTM_RECOVERY || origin_node == replication_node));	
 
-    switch(PGLOGICAL_XACT_EVENT(flags))
+    switch (PGLOGICAL_XACT_EVENT(flags))
     {
 	  case PGLOGICAL_PREPARE:
+	  case PGLOGICAL_PRECOMMIT_PREPARED:
 	  case PGLOGICAL_ABORT_PREPARED:
 		gid = pq_getmsgstring(&s);
 		break;
diff --git a/multimaster.h b/multimaster.h
@@ -39,7 +39,7 @@
 #define MTM_TXTRACE(tx, event)
 #else
 #define MTM_TXTRACE(tx, event) \
-		fprintf(stderr, "[MTM_TXTRACE], %s, %lld, %s, %d\n", tx->gid, (long long)MtmGetSystemTime(), event, getpid())
+		fprintf(stderr, "[MTM_TXTRACE], %s, %lld, %s, %d\n", tx->gid, (long long)MtmGetSystemTime(), event, MyProcPid)
 #endif
 
 #define MULTIMASTER_NAME                "multimaster"
diff --git a/pglogical_apply.c b/pglogical_apply.c
@@ -625,7 +625,9 @@ process_remote_commit(StringInfo in)
 	{
 	    case PGLOGICAL_PRECOMMIT_PREPARED:
 		{
+			Assert(!TransactionIdIsValid(MtmGetCurrentTransactionId()));
 			gid = pq_getmsgstring(in);
+			MTM_LOG2("%d: PGLOGICAL_PRECOMMIT_PREPARED %s", MyProcPid, gid);
 			MtmPrecommitTransaction(gid);
 			return;
 		}
diff --git a/pglogical_proto.c b/pglogical_proto.c
@@ -192,7 +192,8 @@ pglogical_write_commit(StringInfo out, PGLogicalOutputData *data,
 	else
     	Assert(false);
 
-	if (flags == PGLOGICAL_COMMIT || flags == PGLOGICAL_PREPARE || flags == PGLOGICAL_PRECOMMIT_PREPARED) { 
+	if (flags == PGLOGICAL_COMMIT || flags == PGLOGICAL_PREPARE) {
+		/* COMMIT and PREPARE are preceded by BEGIN, which set MtmIsFilteredTxn flag */
 		if (MtmIsFilteredTxn) { 
 			Assert(MtmTransactionRecords == 0);
 			return;

Original file line number	Diff line number	Diff line change
`@@ -625,7 +625,9 @@ process_remote_commit(StringInfo in)`
`625`	`625`	`{`
`626`	`626`	`case PGLOGICAL_PRECOMMIT_PREPARED:`
`627`	`627`	`{`
	`628`	`+ Assert(!TransactionIdIsValid(MtmGetCurrentTransactionId()));`
`628`	`629`	`gid = pq_getmsgstring(in);`
	`630`	`+ MTM_LOG2("%d: PGLOGICAL_PRECOMMIT_PREPARED %s", MyProcPid, gid);`
`629`	`631`	`MtmPrecommitTransaction(gid);`
`630`	`632`	`return;`
`631`	`633`	`}`