Commitfaf90ea

committed

Fix 'aborted on node #' error message

1 parent1fdf868 commitfaf90eaCopy full SHA for faf90ea

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

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) {`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1033,6 +1033,7 @@ MtmCreateTransState(MtmCurrentTrans* x)`
`1033`	`1033`	`ts->isTwoPhase=x->isTwoPhase;`
`1034`	`1034`	`ts->isPinned= false;`
`1035`	`1035`	`ts->votingCompleted= false;`
	`1036`	`+ts->abortedByNode=0;`
`1036`	`1037`	`if (!found) {`
`1037`	`1038`	`ts->isEnqueued= false;`
`1038`	`1039`	`ts->isActive= false;`
`@@ -4552,7 +4553,7 @@ static bool MtmTwoPhaseCommit(MtmCurrentTrans* x)`
`4552`	`4553`	`Assert(ts);`
`4553`	`4554`
`4554`	`4555`	`FinishPreparedTransaction(x->gid, false);`
`4555`		`-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);`
	`4556`	`+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);`
`4556`	`4557`	`}else {`
`4557`	`4558`	`FinishPreparedTransaction(x->gid, true);`
`4558`	`4559`	`MTM_LOG2("Distributed transaction %s (%lld) is committed at %lld with LSN=%lld",x->gid, (long64)x->xid,MtmGetCurrentTime(), (long64)GetXLogInsertRecPtr());`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -269,8 +269,8 @@ typedef struct MtmTransState`
`269`	`269`	`intnConfigChanges;/* Number of cluster configuration changes at moment of transaction start */`
`270`	`270`	`nodemask_tparticipantsMask;/* Mask of nodes involved in transaction */`
`271`	`271`	`nodemask_tvotedMask;/* Mask of voted nodes */`
	`272`	`+intabortedByNode;/* Store info about node on which this tx was aborted */`
`272`	`273`	`TransactionIdxids[1];/* [Mtm->nAllNodes]: transaction ID at replicas */`
`273`		`-intaborted_by_node;/* Store info about node on which this tx was aborted */`
`274`	`274`	`}MtmTransState;`
`275`	`275`
`276`	`276`	`typedefstruct {`

Comments

(0)