Update 2PC support

knizhnik · knizhnik · commit f2ce6d4931e8 · 2016-03-17T14:28:00.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -1116,6 +1116,11 @@ MtmGetState(void)
 	return dtm;
 }
 
+TransactionId MtmGetCurrentTransaction(void)
+{
+	return dtmTx.xid;
+}
+
 static void 
 MtmShmemStartup(void)
 {
diff --git a/contrib/mmts/multimaster.h b/contrib/mmts/multimaster.h
@@ -157,6 +157,7 @@ extern void  MtmSleep(timestamp_t interval);
 extern void  MtmSetCurrentTransactionGID(char const* gid);
 extern void  MtmSetCurrentTransactionCSN(csn_t csn);
 extern csn_t MtmGetTransactionCSN(TransactionId xid);
+extern TransactionId MtmGetCurrentTransactionId(void);
 extern bool  MtmIsRecoveredNode(int nodeId);
 extern void  MtmRefreshClusterStatus(bool nowait);
 extern void  MtmSwitchClusterMode(MtmNodeStatus mode);
diff --git a/contrib/mmts/pglogical_apply.c b/contrib/mmts/pglogical_apply.c
@@ -484,12 +484,15 @@ process_remote_commit(StringInfo in)
 	{
 		case PGLOGICAL_COMMIT:
 		{
-			if (IsTransactionState())
+			if (IsTransactionState()) {
+				Assert(TransactionIdIsValid(MtmGetCurrentTransactionId()));
 				CommitTransactionCommand();
+			}
 			break;
 		}
 		case PGLOGICAL_PREPARE:
 		{
+			Assert(IsTransactionState() && TransactionIdIsValid(MtmGetCurrentTransactionId()));
 			gid = pq_getmsgstring(in);
 			/* prepare TBLOCK_INPROGRESS state for PrepareTransactionBlock() */
 			BeginTransactionBlock();
@@ -503,6 +506,7 @@ process_remote_commit(StringInfo in)
 		}
 		case PGLOGICAL_COMMIT_PREPARED:
 		{
+			Assert(!TransactionIdIsValid(MtmGetCurrentTransactionId()));
 			csn = pq_getmsgint64(in);
 			gid = pq_getmsgstring(in);
 			StartTransactionCommand();
@@ -514,6 +518,7 @@ process_remote_commit(StringInfo in)
 		}
 		case PGLOGICAL_ABORT_PREPARED:
 		{
+			Assert(!TransactionIdIsValid(MtmGetCurrentTransactionId()));
 			gid = pq_getmsgstring(in);
 			StartTransactionCommand();
 			MtmSetCurrentTransactionGID(gid);
@@ -889,8 +894,9 @@ void MtmExecutor(int id, void* work, size_t size)
     {
 		EmitErrorReport();
         FlushErrorState();
-		MTM_TRACE("%d: REMOTE abort transaction %d\n", MyProcPid, GetCurrentTransactionId());
+		MTM_TRACE("%d: REMOTE begin abort transaction %d\n", MyProcPid, MtmGetCurrentTransactionId());
         AbortCurrentTransaction();
+		MTM_TRACE("%d: REMOTE end abort transaction %d\n", MyProcPid, MtmGetCurrentTransactionId());
     }
     PG_END_TRY();
 

Original file line number	Diff line number	Diff line change
`@@ -1116,6 +1116,11 @@ MtmGetState(void)`
`1116`	`1116`	`return dtm;`
`1117`	`1117`	`}`
`1118`	`1118`
	`1119`	`+TransactionId MtmGetCurrentTransaction(void)`
	`1120`	`+{`
	`1121`	`+ return dtmTx.xid;`
	`1122`	`+}`
	`1123`	`+`
`1119`	`1124`	`static void`
`1120`	`1125`	`MtmShmemStartup(void)`
`1121`	`1126`	`{`
Original file line number	Diff line number	Diff line change
`@@ -484,12 +484,15 @@ process_remote_commit(StringInfo in)`
`484`	`484`	`{`
`485`	`485`	`case PGLOGICAL_COMMIT:`
`486`	`486`	`{`
`487`		`- if (IsTransactionState())`
	`487`	`+ if (IsTransactionState()) {`
	`488`	`+ Assert(TransactionIdIsValid(MtmGetCurrentTransactionId()));`
`488`	`489`	`CommitTransactionCommand();`
	`490`	`+ }`
`489`	`491`	`break;`
`490`	`492`	`}`
`491`	`493`	`case PGLOGICAL_PREPARE:`
`492`	`494`	`{`
	`495`	`+ Assert(IsTransactionState() && TransactionIdIsValid(MtmGetCurrentTransactionId()));`
`493`	`496`	`gid = pq_getmsgstring(in);`
`494`	`497`	`/* prepare TBLOCK_INPROGRESS state for PrepareTransactionBlock() */`
`495`	`498`	`BeginTransactionBlock();`
`@@ -503,6 +506,7 @@ process_remote_commit(StringInfo in)`
`503`	`506`	`}`
`504`	`507`	`case PGLOGICAL_COMMIT_PREPARED:`
`505`	`508`	`{`
	`509`	`+ Assert(!TransactionIdIsValid(MtmGetCurrentTransactionId()));`
`506`	`510`	`csn = pq_getmsgint64(in);`
`507`	`511`	`gid = pq_getmsgstring(in);`
`508`	`512`	`StartTransactionCommand();`
`@@ -514,6 +518,7 @@ process_remote_commit(StringInfo in)`
`514`	`518`	`}`
`515`	`519`	`case PGLOGICAL_ABORT_PREPARED:`
`516`	`520`	`{`
	`521`	`+ Assert(!TransactionIdIsValid(MtmGetCurrentTransactionId()));`
`517`	`522`	`gid = pq_getmsgstring(in);`
`518`	`523`	`StartTransactionCommand();`
`519`	`524`	`MtmSetCurrentTransactionGID(gid);`
`@@ -889,8 +894,9 @@ void MtmExecutor(int id, void* work, size_t size)`
`889`	`894`	`{`
`890`	`895`	`EmitErrorReport();`
`891`	`896`	`FlushErrorState();`
`892`		`- MTM_TRACE("%d: REMOTE abort transaction %d\n", MyProcPid, GetCurrentTransactionId());`
	`897`	`+ MTM_TRACE("%d: REMOTE begin abort transaction %d\n", MyProcPid, MtmGetCurrentTransactionId());`
`893`	`898`	`AbortCurrentTransaction();`
	`899`	`+ MTM_TRACE("%d: REMOTE end abort transaction %d\n", MyProcPid, MtmGetCurrentTransactionId());`
`894`	`900`	`}`
`895`	`901`	`PG_END_TRY();`
`896`	`902`