Fix GUC for 2PC timeouts

knizhnik · knizhnik · commit 8c66044c2e9f · 2016-04-18T12:56:14.000+03:00
diff --git a/contrib/mmts/Cluster.pm b/contrib/mmts/Cluster.pm
@@ -100,6 +100,7 @@ sub configure
 			multimaster.conn_strings = '$connstr'
 			multimaster.use_raftable = true
 			multimaster.ignore_tables_without_pk = true
+			multimaster.twopc_min_timeout = 60000
 			raftable.id = $id
 			raftable.peers = '$raftpeers'
 		));
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -720,11 +720,6 @@ static void MtmTransReceiver(Datum arg)
 								MtmAbortTransaction(ts);
 							}
 
-							if (!MtmUseDtm && msg->csn > ts->csn) {
-								ts->csn = msg->csn;
-								MtmSyncClock(ts->csn);
-							}
-
 							if (++ts->nVotes == Mtm->nNodes) { 
 								/* All nodes are finished their transactions */
 								if (ts->status == TRANSACTION_STATUS_ABORTED) { 
@@ -735,7 +730,6 @@ static void MtmTransReceiver(Datum arg)
 									MtmSendNotificationMessage(ts, MSG_PREPARE);									  
 								} else { 
 									Assert(ts->status == TRANSACTION_STATUS_IN_PROGRESS);
-									ts->csn = MtmAssignCSN();
 									ts->status = TRANSACTION_STATUS_UNKNOWN;
 									MtmWakeUpBackend(ts);
 								}
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -804,7 +804,7 @@ MtmPostPrepareTransaction(MtmCurrentTrans* x)
 		}
 		if (!ts->votingCompleted) {
 			ts->status = TRANSACTION_STATUS_ABORTED;
-			elog(WARNING, "Transaction is aborted because of %d msec timeout expiration", (int)timeout);
+			elog(WARNING, "Transaction is aborted because of %d msec timeout expiration, prepare time %d msec", (int)timeout, (int)((ts->csn - x->snapshot)/1000));
 		}
 		x->status = ts->status;
 		MTM_LOG3("%d: Result of vote: %d", MyProcPid, ts->status);
@@ -1605,7 +1605,7 @@ _PG_init(void)
 		return;
 
 	DefineCustomIntVariable(
-		"multimaster.2pc_min_timeout",
+		"multimaster.twopc_min_timeout",
 		"Minamal amount of time (milliseconds) to wait 2PC confirmation from all nodes",
 		"Timeout for 2PC is calculated as MAX(prepare_time*2pc_prepare_ratio/100,2pc_min_timeout)",
 		&Mtm2PCMinTimeout,
@@ -1620,7 +1620,7 @@ _PG_init(void)
 	);
 
 	DefineCustomIntVariable(
-		"multimaster.2pc_prepare_ratio",
+		"multimaster.twopc_prepare_ratio",
 		"Percent of prepare time for maximal time of second phase of two-pahse commit",
 		"Timeout for 2PC is calculated as MAX(prepare_time*2pc_prepare_ratio/100,2pc_min_timeout)",
 		&Mtm2PCPrepareRatio,
diff --git a/contrib/mmts/tests/perf.results b/contrib/mmts/tests/perf.results
@@ -328,3 +328,6 @@ Bench finished at Пт. апр. 15 11:56:45 MSK 2016
 Bench started at Пт. апр. 15 18:41:39 MSK 2016
 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}
 Bench finished at Пт. апр. 15 18:43:05 MSK 2016
+Bench started at Пт. апр. 15 20:01:20 MSK 2016
+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}
+Bench finished at Пт. апр. 15 20:02:42 MSK 2016
