2PC fixes

knizhnik · knizhnik · commit ace27969eb0a · 2016-03-15T20:08:35.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -643,33 +643,36 @@ MtmEndTransaction(MtmCurrentTrans* x, bool commit)
 {
 	MTM_TRACE("%d: End transaction %d, prepared=%d, distributed=%d -> %s\n", MyProcPid, x->xid, x->isPrepared, x->isDistributed, commit ? "commit" : "abort");
 	if (x->isDistributed && (x->isPrepared || x->isReplicated)) {
-		MtmTransState* ts;
+		MtmTransState* ts = NULL;
 		MtmLock(LW_EXCLUSIVE);
 		if (x->isPrepared) { 
 			ts = hash_search(xid2state, &x->xid, HASH_FIND, NULL);
 			Assert(ts != NULL);
 		} else { 
 			MtmTransMap* hm = (MtmTransMap*)hash_search(gid2xid, x->gid, HASH_REMOVE, NULL);
-			Assert(hm != NULL);
-			ts = hm->state;
+			if (hm != NULL) {
+				ts = hm->state;
+			}
 		}
-		if (commit) {
-			ts->status = TRANSACTION_STATUS_COMMITTED;
-			if (x->csn > ts->csn) {
-				ts->csn = x->csn;
-				MtmSyncClock(ts->csn);
+		if (ts != NULL) { 
+			if (commit) {
+				ts->status = TRANSACTION_STATUS_COMMITTED;
+				if (x->csn > ts->csn) {
+					ts->csn = x->csn;
+					MtmSyncClock(ts->csn);
+				}
+			} else { 
+				ts->status = TRANSACTION_STATUS_ABORTED;
+				if (x->isReplicated && TransactionIdIsValid(x->gtid.xid)) { 
+					/* 
+					 * Send notification only of ABORT happens during transaction processing at replicas, 
+					 * do not send notification if ABORT is receiver from master 
+					 */
+					MtmSendNotificationMessage(ts); /* send notification to coordinator */
+				}				
 			}
-		} else { 
-			ts->status = TRANSACTION_STATUS_ABORTED;
-			if (x->isReplicated && TransactionIdIsValid(x->gtid.xid)) { 
-				/* 
-				 * Send notification only of ABORT happens during transaction processing at replicas, 
-				 * do not send notification if ABORT is receiver from master 
-				 */
-				MtmSendNotificationMessage(ts); /* send notification to coordinator */
-			}				
+			MtmAdjustSubtransactions(ts);
 		}
-		MtmAdjustSubtransactions(ts);
 		MtmUnlock();
 	}
 	x->snapshot = INVALID_CSN;
@@ -1691,6 +1694,7 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 							 DestReceiver *dest, char *completionTag)
 {
 	bool skipCommand;
+	MTM_TRACE("%d: Process utility statement %s\n", MyProcPid, queryString);
 	switch (nodeTag(parsetree))
 	{
 	    case T_TransactionStmt:
@@ -1702,8 +1706,10 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 					if (dtmTx.isDistributed && dtmTx.containsDML) { 
 						char gid[MULTIMASTER_MAX_GID_SIZE];
 						MtmGenerateGid(gid);
+						MTM_TRACE("%d: Start 2PC with GID=%s for %s\n", MyProcPid, gid, queryString);
 						if (!IsTransactionBlock()) { 
 							elog(WARNING, "Start transaction block for %d", dtmTx.xid);
+							BeginTransactionBlock();
 							CommitTransactionCommand();
 							StartTransactionCommand();
 						}
diff --git a/contrib/mmts/pglogical_apply.c b/contrib/mmts/pglogical_apply.c
@@ -623,6 +623,7 @@ process_remote_insert(StringInfo s, Relation rel)
 		char* ddl = TextDatumGetCString(new_tuple.values[Anum_mtm_ddl_log_query-1]);
 		int rc;
 		SPI_connect();
+		MTM_TRACE("%d: Execute utility statement %s\n", MyProcPid, ddl);
 		rc = SPI_execute(ddl, false, 0);
         SPI_finish();
 		if (rc != SPI_OK_UTILITY) { 
diff --git a/contrib/mmts/pglogical_receiver.c b/contrib/mmts/pglogical_receiver.c
@@ -274,7 +274,7 @@ pglogical_receiver_main(Datum main_arg)
 	if (originId != InvalidRepOriginId) { 
 		originStartPos = replorigin_get_progress(originId, false);
 		elog(WARNING, "Restart logical receiver at position %lx from node %d", originStartPos, args->remote_node);
-	} else { 
+	} else {  
 		elog(WARNING, "Start logical receiver from node %d", args->remote_node);
 	}
 	CommitTransactionCommand();

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ pglogical_receiver_main(Datum main_arg)`
`274`	`274`	`if (originId != InvalidRepOriginId) {`
`275`	`275`	`originStartPos = replorigin_get_progress(originId, false);`
`276`	`276`	`elog(WARNING, "Restart logical receiver at position %lx from node %d", originStartPos, args->remote_node);`
`277`		`- } else {`
	`277`	`+ } else {`
`278`	`278`	`elog(WARNING, "Start logical receiver from node %d", args->remote_node);`
`279`	`279`	`}`
`280`	`280`	`CommitTransactionCommand();`