Fix problem with rollback of user 2pc transaction

knizhnik · kelvich · commit 3586931d1b87 · 2017-11-13T02:17:39.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -1359,10 +1359,14 @@ MtmAbortPreparedTransaction(MtmCurrentTrans* x)
 		tm = (MtmTransMap*)hash_search(MtmGid2State, x->gid, HASH_FIND, NULL);
 		if (tm == NULL) { 
 			MTM_ELOG(WARNING, "Global transaction ID '%s' is not found", x->gid);
-		} else { 
-			Assert(tm->state != NULL);
+		} else {
+			MtmTransState* ts = tm->state;
+			Assert(ts != NULL);
 			MTM_LOG1("Abort prepared transaction %s (%llu)", x->gid, (long64)x->xid);
-			MtmAbortTransaction(tm->state);
+			MtmAbortTransaction(ts);
+			if (ts->isTwoPhase) { 
+				MtmDeactivateTransaction(ts);
+			}
 		}
 		MtmUnlock();
 		x->status = TRANSACTION_STATUS_ABORTED;
