Disable DDD

knizhnik · knizhnik · commit 27bba5cd6eb6 · 2016-03-11T18:40:28.000+03:00
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -529,7 +529,8 @@ static void MtmTransSender(Datum arg)
 
 static void MtmWakeUpBackend(MtmTransState* ts)
 {
-	ts->voteCompleted = true;
+	ts->voteCompleted = true;								
+	MTM_TRACE("Wakeup backed procno=%d, pid=%d\n", ts->procno, ProcGlobal->allProcs[ts->procno].pid);
 	SetLatch(&ProcGlobal->allProcs[ts->procno].procLatch); 
 }
 
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -511,7 +511,7 @@ MtmXactCallback(XactEvent event, void *arg)
 static bool
 MtmIsUserTransaction()
 {
-	return IsNormalProcessingMode() && MtmDoReplication && !am_walsender && !IsBackgroundWorker && !IsAutoVacuumWorkerProcess();
+	return !IsAutoVacuumLauncherProcess() && IsNormalProcessingMode() && MtmDoReplication && !am_walsender && !IsBackgroundWorker && !IsAutoVacuumWorkerProcess();
 }
 
 static void 
@@ -525,6 +525,7 @@ MtmBeginTransaction(MtmCurrentTrans* x)
 		if (x->isDistributed && dtm->status != MTM_ONLINE) { 
 			/* reject all user's transactions at offline cluster */
 			MtmUnlock();			
+			Assert(dtm->status == MTM_ONLINE);
 			elog(ERROR, "Multimaster node is not online: current status %s", MtmNodeStatusMnem[dtm->status]);
 		}
 		x->containsDML = false;
@@ -1765,7 +1766,7 @@ MtmDetectGlobalDeadLock(PGPROC* proc)
 				int size;
 				void* data = PaxosGet(psprintf("lock-graph-%d", i+1), &size, NULL, true);
 				if (data == NULL) { 
-					hasDeadlock = true; /* Just temporary hack until no Paxos */
+					return true; /* Just temporary hack until no Paxos */
 				} else { 
 					MtmGraphAdd(&graph, (GlobalTransactionId*)data, size/sizeof(GlobalTransactionId));
 				}

Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,8 @@ static void MtmTransSender(Datum arg)`
`529`	`529`
`530`	`530`	`static void MtmWakeUpBackend(MtmTransState* ts)`
`531`	`531`	`{`
`532`		`- ts->voteCompleted = true;`
	`532`	`+ ts->voteCompleted = true;`
	`533`	`+ MTM_TRACE("Wakeup backed procno=%d, pid=%d\n", ts->procno, ProcGlobal->allProcs[ts->procno].pid);`
`533`	`534`	`SetLatch(&ProcGlobal->allProcs[ts->procno].procLatch);`
`534`	`535`	`}`
`535`	`536`
Original file line number	Diff line number	Diff line change
`@@ -511,7 +511,7 @@ MtmXactCallback(XactEvent event, void *arg)`
`511`	`511`	`static bool`
`512`	`512`	`MtmIsUserTransaction()`
`513`	`513`	`{`
`514`		`- return IsNormalProcessingMode() && MtmDoReplication && !am_walsender && !IsBackgroundWorker && !IsAutoVacuumWorkerProcess();`
	`514`	`+ return !IsAutoVacuumLauncherProcess() && IsNormalProcessingMode() && MtmDoReplication && !am_walsender && !IsBackgroundWorker && !IsAutoVacuumWorkerProcess();`
`515`	`515`	`}`
`516`	`516`
`517`	`517`	`static void`
`@@ -525,6 +525,7 @@ MtmBeginTransaction(MtmCurrentTrans* x)`
`525`	`525`	`if (x->isDistributed && dtm->status != MTM_ONLINE) {`
`526`	`526`	`/* reject all user's transactions at offline cluster */`
`527`	`527`	`MtmUnlock();`
	`528`	`+ Assert(dtm->status == MTM_ONLINE);`
`528`	`529`	`elog(ERROR, "Multimaster node is not online: current status %s", MtmNodeStatusMnem[dtm->status]);`
`529`	`530`	`}`
`530`	`531`	`x->containsDML = false;`
`@@ -1765,7 +1766,7 @@ MtmDetectGlobalDeadLock(PGPROC* proc)`
`1765`	`1766`	`int size;`
`1766`	`1767`	`void* data = PaxosGet(psprintf("lock-graph-%d", i+1), &size, NULL, true);`
`1767`	`1768`	`if (data == NULL) {`
`1768`		`- hasDeadlock = true; /* Just temporary hack until no Paxos */`
	`1769`	`+ return true; /* Just temporary hack until no Paxos */`
`1769`	`1770`	`} else {`
`1770`	`1771`	`MtmGraphAdd(&graph, (GlobalTransactionId*)data, size/sizeof(GlobalTransactionId));`
`1771`	`1772`	`}`