Commitc7b969f

committed

Restpore assert in arbiter on receiving PREPARE in aborted state

1 parented87b14 commitc7b969fCopy full SHA for c7b969f

File tree

-6

lines changed

-6

lines changed

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -915,15 +915,17 @@ static void MtmTransReceiver(Datum arg)`
`915`	`915`	`}else {`
`916`	`916`	`switch (msg->code) {`
`917`	`917`	`caseMSG_PREPARE:`
`918`		`-if (ts->status==TRANSACTION_STATUS_IN_PROGRESS) {`
`919`		`-ts->status=TRANSACTION_STATUS_UNKNOWN;`
`920`		`-ts->csn=MtmAssignCSN();`
`921`		`-MtmAdjustSubtransactions(ts);`
`922`		`-MtmSendNotificationMessage(ts,MSG_PREPARED);`
	`918`	`+Assert(ts->status==TRANSACTION_STATUS_IN_PROGRESS);`
	`919`	`+ts->status=TRANSACTION_STATUS_UNKNOWN;`
	`920`	`+ts->csn=MtmAssignCSN();`
	`921`	`+MtmAdjustSubtransactions(ts);`
	`922`	`+MtmSendNotificationMessage(ts,MSG_PREPARED);`
	`923`	`+#if0`
`923`	`924`	`}else {`
`924`	`925`	`Assert(ts->status==TRANSACTION_STATUS_ABORTED);`
`925`	`926`	`MtmSendNotificationMessage(ts,MSG_ABORTED);`
`926`	`927`	`}`
	`928`	`+#endif`
`927`	`929`	`break;`
`928`	`930`	`default:`
`929`	`931`	`Assert(false);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -798,7 +798,7 @@ void MtmWatchdog(void)`
`798`	`798`	`if (Mtm->nodes[i].lastHeartbeat!=0`
`799`	`799`	`&&now>Mtm->nodes[i].lastHeartbeat+MSEC_TO_USEC(MtmHeartbeatRecvTimeout))`
`800`	`800`	`{`
`801`		`-elog(WARNING,"Heartbeatwas received from node %d during %d msec",`
	`801`	`+elog(WARNING,"Heartbeatis not received from node %d during %d msec",`
`802`	`802`	`i+1, (int)USEC_TO_MSEC(now-Mtm->nodes[i].lastHeartbeat));`
`803`	`803`	`MtmOnNodeDisconnect(i+1);`
`804`	`804`	`}`

Comments

(0)