Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitbfc9f9a

Browse files
committed
Fix 2pc timeout check
1 parent5760d42 commitbfc9f9a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

‎contrib/mmts/multimaster.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -836,13 +836,13 @@ MtmPostPrepareTransaction(MtmCurrentTrans* x)
836836
MtmUnlock();
837837
MtmResetTransaction(x);
838838
}else {
839-
time_ttransTimeout=Max(Mtm2PCMinTimeout, (ts->csn-ts->snapshot)*Mtm2PCPrepareRatio/100000);/* usec->msec and percents */
839+
time_ttransTimeout=Max(MSEC_TO_USEC(Mtm2PCMinTimeout), (ts->csn-ts->snapshot)*Mtm2PCPrepareRatio/100);/* usec->msec and percents */
840840
intresult=0;
841841
intnConfigChanges=Mtm->nConfigChanges;
842842

843843
timestamp_tstart=MtmGetSystemTime();
844844
/* wait votes from all nodes */
845-
while (!ts->votingCompleted&&start+transTimeout<MtmGetSystemTime())
845+
while (!ts->votingCompleted&&start+transTimeout>=MtmGetSystemTime())
846846
{
847847
MtmUnlock();
848848
MtmWatchdog();

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp