Commitc416fb5

committed

mention node number in 'aborted by DTM' error message

1 parent3552597 commitc416fb5Copy full SHA for c416fb5

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 0 deletions

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

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4764,8 +4764,12 @@ static bool MtmTwoPhaseCommit(MtmCurrentTrans* x)`
`4764`	`4764`	`}else {`
`4765`	`4765`	`Assert(x->isActive);`
`4766`	`4766`	`if (x->status==TRANSACTION_STATUS_ABORTED) {`
	`4767`	`+MtmTransState*ts;`
	`4768`	`+ts= (MtmTransState*)hash_search(MtmXid2State,&(x->xid),HASH_FIND,NULL);`
	`4769`	`+Assert(ts);`
	`4770`	`+`
`4767`	`4771`	`FinishPreparedTransaction(x->gid, false);`
`4768`		`-MTM_ELOG(ERROR,"Transaction %s (%llu) is aborted onneighbournode. Checkneighbour nodeslog to see error details.",x->gid, (long64)x->xid);`
	`4772`	`+MTM_ELOG(ERROR,"Transaction %s (%llu) is aborted on node %d. Checkitslog to see error details.",x->gid, (long64)x->xid,ts->aborted_by_node);`
`4769`	`4773`	`}else {`
`4770`	`4774`	`FinishPreparedTransaction(x->gid, true);`
`4771`	`4775`	`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 & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -267,6 +267,7 @@ typedef struct MtmTransState`
`267`	`267`	`nodemask_tparticipantsMask;/* Mask of nodes involved in transaction */`
`268`	`268`	`nodemask_tvotedMask;/* Mask of voted nodes */`
`269`	`269`	`TransactionIdxids[1];/* [Mtm->nAllNodes]: transaction ID at replicas */`
	`270`	`+intaborted_by_node;/* Store info about node on which this tx was aborted */`
`270`	`271`	`}MtmTransState;`
`271`	`272`
`272`	`273`	`typedefstruct {`

Comments

(0)