Some 2pc fixes

knizhnik · knizhnik · commit 7764ed762480 · 2016-03-13T22:44:38.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -103,6 +103,7 @@ static void MtmBeginTransaction(MtmCurrentTrans* x);
 static void MtmPrecommitTransaction(MtmCurrentTrans* x);
 static bool MtmCommitTransaction(TransactionId xid, int nsubxids, TransactionId *subxids);
 static void MtmPrepareTransaction(MtmCurrentTrans* x);
+static void MtmCommitPreparedTransaction(MtmCurrentTrans* x);
 static void MtmEndTransaction(MtmCurrentTrans* x, bool commit);
 static TransactionId MtmGetOldestXmin(Relation rel, bool ignoreVacuum);
 static bool MtmXidInMVCCSnapshot(TransactionId xid, Snapshot snapshot);
@@ -494,6 +495,9 @@ MtmXactCallback(XactEvent event, void *arg)
 	  case XACT_EVENT_PREPARE:
 		MtmPrepareTransaction(&dtmTx);
 		break;
+	  case XACT_EVENT_COMMIT_PREPARED:
+		MtmCommitPreparedTransaction(&dtmTx);
+		break;
 	  case XACT_EVENT_COMMIT:
 		MtmEndTransaction(&dtmTx, true);
 		break;
@@ -652,10 +656,15 @@ static void MtmPrecommitTransaction(MtmCurrentTrans* x)
 static void 
 MtmPrepareTransaction(MtmCurrentTrans* x)
 {	
-	TransactionId *subxids;
-	int nSubxids;
 	MtmPrecommitTransaction(x);
 	x->isPrepared = true;	
+}
+
+static void 
+MtmCommitPreparedTransaction(MtmCurrentTrans* x)
+{
+	TransactionId *subxids;
+	int nSubxids;
 	nSubxids = xactGetCommittedChildren(&subxids);
 	if (!MtmCommitTransaction(x->xid, nSubxids, subxids))
 	{
@@ -1536,12 +1545,15 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 						char* gid = MtmGenerateGid();
 						if (!PrepareTransactionBlock(gid))
 						{
+							elog(WARNING, "Failed to prepare transaction %s", gid);
 							/* report unsuccessful commit in completionTag */
 							if (completionTag) { 
 								strcpy(completionTag, "ROLLBACK");
 							}
 							/* ??? Should we do explicit rollback */
 						} else { 
+							CommitTransactionCommand();
+							StartTransactionCommand();
 							FinishPreparedTransaction(gid, true);
 						}
 						return;
diff --git a/contrib/mmts/pglogical_apply.c b/contrib/mmts/pglogical_apply.c
@@ -467,7 +467,7 @@ static void
 process_remote_commit(StringInfo in)
 {
 	uint8 			flags;
-	const char	   *gid;
+	const char	   *gid = NULL;
 
 	/* read flags */
 	flags = pq_getmsgbyte(in);
@@ -480,6 +480,8 @@ process_remote_commit(StringInfo in)
 	if (PGLOGICAL_XACT_EVENT(flags) != PGLOGICAL_COMMIT)
 		gid = pq_getmsgstring(in);
 
+	MTM_TRACE("PGLOGICAL_RECV commit: flags=%d, gid=%s\n", flags, gid);
+
 	switch(PGLOGICAL_XACT_EVENT(flags))
 	{
 		case PGLOGICAL_COMMIT:
diff --git a/contrib/mmts/pglogical_proto.c b/contrib/mmts/pglogical_proto.c
@@ -145,6 +145,8 @@ pglogical_write_commit(StringInfo out, PGLogicalOutputData *data,
     else
     	Assert(false);
 
+	MTM_TRACE("PGLOGICAL_SEND commit: event=%d, gid=%s\n", flags, txn->gid);
+
     /* send the flags field */
     pq_sendbyte(out, flags);
 
