Commitaac8d16

authored and

committed

Fix 2pc timeout check

1 parent0adf743 commitaac8d16Copy full SHA for aac8d16

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -835,13 +835,13 @@ MtmPostPrepareTransaction(MtmCurrentTrans* x)`
`835`	`835`	`MtmUnlock();`
`836`	`836`	`MtmResetTransaction(x);`
`837`	`837`	`}else {`
`838`		`-time_ttransTimeout=Max(Mtm2PCMinTimeout, (ts->csn-ts->snapshot)Mtm2PCPrepareRatio/100000);/ usec->msec and percents */`
	`838`	`+time_ttransTimeout=Max(MSEC_TO_USEC(Mtm2PCMinTimeout), (ts->csn-ts->snapshot)Mtm2PCPrepareRatio/100);/ usec->msec and percents */`
`839`	`839`	`intresult=0;`
`840`	`840`	`intnConfigChanges=Mtm->nConfigChanges;`
`841`	`841`
`842`	`842`	`timestamp_tstart=MtmGetSystemTime();`
`843`	`843`	`/* wait votes from all nodes */`
`844`		`-while (!ts->votingCompleted&&start+transTimeout<MtmGetSystemTime())`
	`844`	`+while (!ts->votingCompleted&&start+transTimeout>=MtmGetSystemTime())`
`845`	`845`	`{`
`846`	`846`	`MtmUnlock();`
`847`	`847`	`MtmWatchdog();`

Comments

(0)