Commitabd79ad

authored and

committed

Fix GUC for 2PC timeouts

1 parent90c65ee commitabd79adCopy full SHA for abd79ad

File tree

-9

lines changed

-9

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ sub configure`
`100`	`100`	`multimaster.conn_strings = '$connstr'`
`101`	`101`	`multimaster.use_raftable = true`
`102`	`102`	`multimaster.ignore_tables_without_pk = true`
	`103`	`+multimaster.twopc_min_timeout = 60000`
`103`	`104`	`raftable.id =$id`
`104`	`105`	`raftable.peers = '$raftpeers'`
`105`	`106`	`));`

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -720,11 +720,6 @@ static void MtmTransReceiver(Datum arg)`
`720`	`720`	`MtmAbortTransaction(ts);`
`721`	`721`	`}`
`722`	`722`
`723`		`-if (!MtmUseDtm&&msg->csn>ts->csn) {`
`724`		`-ts->csn=msg->csn;`
`725`		`-MtmSyncClock(ts->csn);`
`726`		`-}`
`727`		`-`
`728`	`723`	`if (++ts->nVotes==Mtm->nNodes) {`
`729`	`724`	`/* All nodes are finished their transactions */`
`730`	`725`	`if (ts->status==TRANSACTION_STATUS_ABORTED) {`
`@@ -735,7 +730,6 @@ static void MtmTransReceiver(Datum arg)`
`735`	`730`	`MtmSendNotificationMessage(ts,MSG_PREPARE);`
`736`	`731`	`}else {`
`737`	`732`	`Assert(ts->status==TRANSACTION_STATUS_IN_PROGRESS);`
`738`		`-ts->csn=MtmAssignCSN();`
`739`	`733`	`ts->status=TRANSACTION_STATUS_UNKNOWN;`
`740`	`734`	`MtmWakeUpBackend(ts);`
`741`	`735`	`}`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -803,7 +803,7 @@ MtmPostPrepareTransaction(MtmCurrentTrans* x)`
`803`	`803`	`}`
`804`	`804`	`if (!ts->votingCompleted) {`
`805`	`805`	`ts->status=TRANSACTION_STATUS_ABORTED;`
`806`		`-elog(WARNING,"Transaction is aborted because of %d msec timeout expiration", (int)timeout);`
	`806`	`+elog(WARNING,"Transaction is aborted because of %d msec timeout expiration, prepare time %d msec", (int)timeout, (int)((ts->csn-x->snapshot)/1000));`
`807`	`807`	`}`
`808`	`808`	`x->status=ts->status;`
`809`	`809`	`MTM_LOG3("%d: Result of vote: %d",MyProcPid,ts->status);`
`@@ -1604,7 +1604,7 @@ _PG_init(void)`
`1604`	`1604`	`return;`
`1605`	`1605`
`1606`	`1606`	`DefineCustomIntVariable(`
`1607`		`-"multimaster.2pc_min_timeout",`
	`1607`	`+"multimaster.twopc_min_timeout",`
`1608`	`1608`	`"Minamal amount of time (milliseconds) to wait 2PC confirmation from all nodes",`
`1609`	`1609`	`"Timeout for 2PC is calculated as MAX(prepare_time*2pc_prepare_ratio/100,2pc_min_timeout)",`
`1610`	`1610`	`&Mtm2PCMinTimeout,`
`@@ -1619,7 +1619,7 @@ _PG_init(void)`
`1619`	`1619`	`);`
`1620`	`1620`
`1621`	`1621`	`DefineCustomIntVariable(`
`1622`		`-"multimaster.2pc_prepare_ratio",`
	`1622`	`+"multimaster.twopc_prepare_ratio",`
`1623`	`1623`	`"Percent of prepare time for maximal time of second phase of two-pahse commit",`
`1624`	`1624`	`"Timeout for 2PC is calculated as MAX(prepare_time*2pc_prepare_ratio/100,2pc_min_timeout)",`
`1625`	`1625`	`&Mtm2PCPrepareRatio,`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -328,3 +328,6 @@ Bench finished at Пт. апр. 15 11:56:45 MSK 2016`
`328`	`328`	`Bench started at Пт. апр. 15 18:41:39 MSK 2016`
`329`	`329`	`astro5:{tps:17367.895646, transactions:1500000, selects:0, updates:3002062, aborts:1968, abort_percent: 0, readers:0, writers:150, update_percent:100, accounts:500000, iterations:10000, hosts:3}`
`330`	`330`	`Bench finished at Пт. апр. 15 18:43:05 MSK 2016`
	`331`	`+Bench started at Пт. апр. 15 20:01:20 MSK 2016`
	`332`	`+astro5:{tps:18310.750502, transactions:1500000, selects:0, updates:3001948, aborts:1897, abort_percent: 0, readers:0, writers:150, update_percent:100, accounts:500000, iterations:10000, hosts:3}`
	`333`	`+Bench finished at Пт. апр. 15 20:02:42 MSK 2016`

Comments

(0)