Fix race condition in MtmUnlock

knizhnik · kelvich · commit 74fa53c91d25 · 2017-11-13T02:17:38.000+03:00
diff --git a/bgwpool.c b/bgwpool.c
@@ -13,6 +13,7 @@
 #include "tcop/pquery.h"
 
 #include "bgwpool.h"
+#include "multimaster.h"
 
 bool MtmIsLogicalReceiver;
 int  MtmMaxWorkers;
@@ -32,6 +33,8 @@ static void BgwPoolMainLoop(BgwPool* pool)
     void* work;
 	static PortalData fakePortal;
 
+	MTM_ELOG(LOG, "Start background worker %d, shutdown=%d", MyProcPid, pool->shutdown);
+
 	MtmIsLogicalReceiver = true;
 	MtmPool = pool;
 
@@ -48,7 +51,7 @@ static void BgwPoolMainLoop(BgwPool* pool)
     while (true) { 
         PGSemaphoreLock(&pool->available);
         SpinLockAcquire(&pool->lock);
-		if (pool->shutdown) { 
+		if (pool->shutdown) { 	
 			break;
 		}
         size = *(int*)&pool->queue[pool->head];
@@ -83,6 +86,7 @@ static void BgwPoolMainLoop(BgwPool* pool)
         SpinLockRelease(&pool->lock);
     }
 	SpinLockRelease(&pool->lock);
+	MTM_ELOG(LOG, "Shutdown background worker %d", MyProcPid);
 }
 
 void BgwPoolInit(BgwPool* pool, BgwPoolExecutor executor, char const* dbname,  char const* dbuser, size_t queueSize, size_t nWorkers)
diff --git a/multimaster.c b/multimaster.c
@@ -338,8 +338,8 @@ void MtmUnlock(void)
 		Assert(Mtm->lastLockHolder == MyProcPid);
 		return;
 	}
-	LWLockRelease((LWLockId)&Mtm->locks[MTM_STATE_LOCK_ID]);
 	Mtm->lastLockHolder = 0;
+	LWLockRelease((LWLockId)&Mtm->locks[MTM_STATE_LOCK_ID]);
 }
 
 void MtmLockNode(int nodeId, LWLockMode mode)

Original file line number	Diff line number	Diff line change
`@@ -338,8 +338,8 @@ void MtmUnlock(void)`
`338`	`338`	`Assert(Mtm->lastLockHolder == MyProcPid);`
`339`	`339`	`return;`
`340`	`340`	`}`
`341`		`- LWLockRelease((LWLockId)&Mtm->locks[MTM_STATE_LOCK_ID]);`
`342`	`341`	`Mtm->lastLockHolder = 0;`
	`342`	`+ LWLockRelease((LWLockId)&Mtm->locks[MTM_STATE_LOCK_ID]);`
`343`	`343`	`}`
`344`	`344`
`345`	`345`	`void MtmLockNode(int nodeId, LWLockMode mode)`