Enable interrupts in Mtm2PCVoting

knizhnik · kelvich · commit abb6801c2c2d · 2017-11-13T02:17:39.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -1181,9 +1181,12 @@ Mtm2PCVoting(MtmCurrentTrans* x, MtmTransState* ts)
 	timestamp_t start = MtmGetSystemTime();
 	timestamp_t deadline = start + timeout;
 	timestamp_t now;
+	uint32 SaveCancelHoldoffCount = QueryCancelHoldoffCount;
 
 	Assert(ts->csn > ts->snapshot);
 
+	QueryCancelHoldoffCount = 0;
+
 	/* Wait votes from all nodes until: */
 	while (!MtmVotingCompleted(ts))
 	{ 
@@ -1212,6 +1215,8 @@ Mtm2PCVoting(MtmCurrentTrans* x, MtmTransState* ts)
 			}
 		}
 	}
+	QueryCancelHoldoffCount = SaveCancelHoldoffCount;
+
 	if (ts->status != TRANSACTION_STATUS_ABORTED && !ts->votingCompleted) { 
 		if (ts->isPrepared) { 
 			MTM_ELOG(WARNING, "Commit of distributed transaction %s is suspended because node is switched to %s mode", ts->gid, MtmNodeStatusMnem[Mtm->status]);				

Original file line number	Diff line number	Diff line change
`@@ -1181,9 +1181,12 @@ Mtm2PCVoting(MtmCurrentTrans* x, MtmTransState* ts)`
`1181`	`1181`	`timestamp_t start = MtmGetSystemTime();`
`1182`	`1182`	`timestamp_t deadline = start + timeout;`
`1183`	`1183`	`timestamp_t now;`
	`1184`	`+ uint32 SaveCancelHoldoffCount = QueryCancelHoldoffCount;`
`1184`	`1185`
`1185`	`1186`	`Assert(ts->csn > ts->snapshot);`
`1186`	`1187`
	`1188`	`+ QueryCancelHoldoffCount = 0;`
	`1189`	`+`
`1187`	`1190`	`/* Wait votes from all nodes until: */`
`1188`	`1191`	`while (!MtmVotingCompleted(ts))`
`1189`	`1192`	`{`
`@@ -1212,6 +1215,8 @@ Mtm2PCVoting(MtmCurrentTrans* x, MtmTransState* ts)`
`1212`	`1215`	`}`
`1213`	`1216`	`}`
`1214`	`1217`	`}`
	`1218`	`+ QueryCancelHoldoffCount = SaveCancelHoldoffCount;`
	`1219`	`+`
`1215`	`1220`	`if (ts->status != TRANSACTION_STATUS_ABORTED && !ts->votingCompleted) {`
`1216`	`1221`	`if (ts->isPrepared) {`
`1217`	`1222`	`MTM_ELOG(WARNING, "Commit of distributed transaction %s is suspended because node is switched to %s mode", ts->gid, MtmNodeStatusMnem[Mtm->status]);`