Fix bug in MtmFinishPreparedTransaction

knizhnik · kelvich · commit b437b5e40ac2 · 2017-11-13T02:17:33.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -2802,14 +2802,14 @@ void MtmRollbackPreparedTransaction(char const* gid)
 
 void MtmFinishPreparedTransaction(MtmTransState* ts, bool commit)
 {
-	if (Mtm->nodes[MtmNodeId-1].originId == InvalidRepOriginId) { 
-		/* This dummy origin is used for local commits/aborts which should not be replicated */
-		Mtm->nodes[MtmNodeId-1].originId = replorigin_create(psprintf(MULTIMASTER_SLOT_PATTERN, MtmNodeId));
-	}
 	Assert(ts->votingCompleted);
 	Assert(!IsTransactionState());
 	MtmResetTransaction();
 	StartTransactionCommand();
+	if (Mtm->nodes[MtmNodeId-1].originId == InvalidRepOriginId) { 
+		/* This dummy origin is used for local commits/aborts which should not be replicated */
+		Mtm->nodes[MtmNodeId-1].originId = replorigin_create(psprintf(MULTIMASTER_SLOT_PATTERN, MtmNodeId));
+	}
 	MtmBeginSession(MtmNodeId);
 	MtmSetCurrentTransactionCSN(ts->csn);
 	MtmSetCurrentTransactionGID(ts->gid);
