mention node number in 'aborted by DTM' error message

kelvich · kelvich · commit 0a5d843e5faa · 2017-06-29T13:38:45.000+03:00
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -1075,6 +1075,7 @@ static void MtmReceiver(Datum arg)
 							if (ts->status != TRANSACTION_STATUS_ABORTED) { 
 								MTM_LOG1("Arbiter receive abort message for transaction %s (%llu) from node %d", ts->gid, (long64)ts->xid, node);
 								Assert(ts->status == TRANSACTION_STATUS_IN_PROGRESS);
+								ts->aborted_by_node = node;
 								MtmAbortTransaction(ts);
 							}
 							if ((ts->participantsMask & ~Mtm->disabledNodeMask & ~ts->votedMask) == 0) {
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -4750,8 +4750,12 @@ static bool MtmTwoPhaseCommit(MtmCurrentTrans* x)
 			} else {
 				Assert(x->isActive);
 				if (x->status == TRANSACTION_STATUS_ABORTED) {
+					MtmTransState* ts;
+					ts = (MtmTransState*) hash_search(MtmXid2State, &(x->xid), HASH_FIND, NULL);
+					Assert(ts);
+
 					FinishPreparedTransaction(x->gid, false);
-					MTM_ELOG(ERROR, "Transaction %s (%llu) is aborted on neighbour node. Check neighbour nodes log to see error details.", x->gid, (long64)x->xid);
+					MTM_ELOG(ERROR, "Transaction %s (%llu) is aborted on node %d. Check its log to see error details.", x->gid, (long64)x->xid, ts->aborted_by_node);
 				} else {
 					FinishPreparedTransaction(x->gid, true);
 					MTM_LOG2("Distributed transaction %s (%lld) is committed at %lld with LSN=%lld", x->gid, (long64)x->xid, MtmGetCurrentTime(), (long64)GetXLogInsertRecPtr());
diff --git a/contrib/mmts/multimaster.h b/contrib/mmts/multimaster.h
@@ -267,6 +267,7 @@ typedef struct MtmTransState
 	nodemask_t     participantsMask;   /* Mask of nodes involved in transaction */
 	nodemask_t     votedMask;          /* Mask of voted nodes */
 	TransactionId  xids[1];            /* [Mtm->nAllNodes]: transaction ID at replicas */
+	int			   aborted_by_node;    /* Store info about node on which this tx was aborted */
 } MtmTransState;
 
 typedef struct {

Original file line number	Diff line number	Diff line change
`@@ -1075,6 +1075,7 @@ static void MtmReceiver(Datum arg)`
`1075`	`1075`	`if (ts->status != TRANSACTION_STATUS_ABORTED) {`
`1076`	`1076`	`MTM_LOG1("Arbiter receive abort message for transaction %s (%llu) from node %d", ts->gid, (long64)ts->xid, node);`
`1077`	`1077`	`Assert(ts->status == TRANSACTION_STATUS_IN_PROGRESS);`
	`1078`	`+ ts->aborted_by_node = node;`
`1078`	`1079`	`MtmAbortTransaction(ts);`
`1079`	`1080`	`}`
`1080`	`1081`	`if ((ts->participantsMask & ~Mtm->disabledNodeMask & ~ts->votedMask) == 0) {`