Merge branch 'master' of https://github.com/postgrespro/postgres_cluster

knizhnik · knizhnik · commit 2caa635fff10 · 2016-03-11T17:12:10.000+03:00
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -529,7 +529,7 @@ static void MtmTransSender(Datum arg)
 
 static void MtmWakeUpBackend(MtmTransState* ts)
 {
-	ts->done = true;
+	ts->voteCompleted = true;
 	SetLatch(&ProcGlobal->allProcs[ts->procno].procLatch); 
 }
 
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -629,7 +629,7 @@ static void MtmPrecommitTransaction(MtmCurrentTrans* x)
 	ts->cmd = MSG_INVALID;
 	ts->procno = MyProc->pgprocno;
 	ts->nVotes = 0; 
-	ts->done = false;
+	ts->voteCompleted = false;
 	dtm->transCount += 1;
 
 	if (TransactionIdIsValid(x->gtid.xid)) { 
@@ -1638,7 +1638,7 @@ MtmVoteForTransaction(MtmTransState* ts)
 		}
 	}
 	MTM_TRACE("%d: Node %d waiting latch...\n", MyProcPid, MtmNodeId);
-	while (!ts->done) {
+	while (!ts->voteCompleted) {
 		MtmUnlock();
 		WaitLatch(&MyProc->procLatch, WL_LATCH_SET, -1);
 		ResetLatch(&MyProc->procLatch);			
diff --git a/contrib/mmts/multimaster.h b/contrib/mmts/multimaster.h
@@ -85,7 +85,7 @@ typedef struct MtmTransState
 	int            nSubxids;           /* Number of subtransanctions */
 	struct MtmTransState* nextVoting;  /* Next element in L1-list of voting transactions. */
     struct MtmTransState* next;        /* Next element in L1 list of all finished transaction present in xid2state hash */
-	bool done;
+	bool voteCompleted;                /* Responses necessary to make a decision are received by coordinator of transaction */
 	TransactionId xids[1];             /* transaction ID at replicas: varying size MtmNodes */
 } MtmTransState;
 

Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,7 @@ static void MtmTransSender(Datum arg)`
`529`	`529`
`530`	`530`	`static void MtmWakeUpBackend(MtmTransState* ts)`
`531`	`531`	`{`
`532`		`- ts->done = true;`
	`532`	`+ ts->voteCompleted = true;`
`533`	`533`	`SetLatch(&ProcGlobal->allProcs[ts->procno].procLatch);`
`534`	`534`	`}`
`535`	`535`