Fix 'aborted on node #' error message

kelvich · kelvich · commit faf90ea1d874 · 2017-11-13T02:21:37.000+03:00
diff --git a/arbiter.c b/arbiter.c
@@ -1078,7 +1078,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;
+								ts->abortedByNode = node;
 								MtmAbortTransaction(ts);
 							}
 							if ((ts->participantsMask & ~Mtm->disabledNodeMask & ~ts->votedMask) == 0) {
diff --git a/multimaster.c b/multimaster.c
@@ -1033,6 +1033,7 @@ MtmCreateTransState(MtmCurrentTrans* x)
 	ts->isTwoPhase = x->isTwoPhase;
 	ts->isPinned = false;
 	ts->votingCompleted = false;
+	ts->abortedByNode = 0;
 	if (!found) {
 		ts->isEnqueued = false;
 		ts->isActive = false;
@@ -4552,7 +4553,7 @@ static bool MtmTwoPhaseCommit(MtmCurrentTrans* x)
 					Assert(ts);
 
 					FinishPreparedTransaction(x->gid, false);
-					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);
+					MTM_ELOG(ERROR, "Transaction %s (%llu) is aborted on node %d. Check its log to see error details.", x->gid, (long64)x->xid, ts->abortedByNode);
 				} 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/multimaster.h b/multimaster.h
@@ -269,8 +269,8 @@ typedef struct MtmTransState
 	int            nConfigChanges;     /* Number of cluster configuration changes at moment of transaction start */
 	nodemask_t     participantsMask;   /* Mask of nodes involved in transaction */
 	nodemask_t     votedMask;          /* Mask of voted nodes */
+	int			   abortedByNode;      /* Store info about node on which this tx was aborted */
 	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
`@@ -1078,7 +1078,7 @@ static void MtmReceiver(Datum arg)`
`1078`	`1078`	`if (ts->status != TRANSACTION_STATUS_ABORTED) {`
`1079`	`1079`	`MTM_LOG1("Arbiter receive abort message for transaction %s (%llu) from node %d", ts->gid, (long64)ts->xid, node);`
`1080`	`1080`	`Assert(ts->status == TRANSACTION_STATUS_IN_PROGRESS);`
`1081`		`- ts->aborted_by_node = node;`
	`1081`	`+ ts->abortedByNode = node;`
`1082`	`1082`	`MtmAbortTransaction(ts);`
`1083`	`1083`	`}`
`1084`	`1084`	`if ((ts->participantsMask & ~Mtm->disabledNodeMask & ~ts->votedMask) == 0) {`