Commita10b8b7

committed

Fix race condition in MtmUnlock

1 parent15e87a0 commita10b8b7Copy full SHA for a10b8b7

File tree

-2

lines changed

-2

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`#include"tcop/pquery.h"`
`14`	`14`
`15`	`15`	`#include"bgwpool.h"`
	`16`	`+#include"multimaster.h"`
`16`	`17`
`17`	`18`	`boolMtmIsLogicalReceiver;`
`18`	`19`	`intMtmMaxWorkers;`
`@@ -32,6 +33,8 @@ static void BgwPoolMainLoop(BgwPool* pool)`
`32`	`33`	`void*work;`
`33`	`34`	`staticPortalDatafakePortal;`
`34`	`35`
	`36`	`+MTM_ELOG(LOG,"Start background worker %d, shutdown=%d",MyProcPid,pool->shutdown);`
	`37`	`+`
`35`	`38`	`MtmIsLogicalReceiver= true;`
`36`	`39`	`MtmPool=pool;`
`37`	`40`
`@@ -48,7 +51,7 @@ static void BgwPoolMainLoop(BgwPool* pool)`
`48`	`51`	`while (true) {`
`49`	`52`	`PGSemaphoreLock(&pool->available);`
`50`	`53`	`SpinLockAcquire(&pool->lock);`
`51`		`-if (pool->shutdown) {`
	`54`	`+if (pool->shutdown) {`
`52`	`55`	`break;`
`53`	`56`	`}`
`54`	`57`	`size=(int)&pool->queue[pool->head];`
`@@ -83,6 +86,7 @@ static void BgwPoolMainLoop(BgwPool* pool)`
`83`	`86`	`SpinLockRelease(&pool->lock);`
`84`	`87`	`}`
`85`	`88`	`SpinLockRelease(&pool->lock);`
	`89`	`+MTM_ELOG(LOG,"Shutdown background worker %d",MyProcPid);`
`86`	`90`	`}`
`87`	`91`
`88`	`92`	`voidBgwPoolInit(BgwPoolpool,BgwPoolExecutorexecutor,charconstdbname,charconst*dbuser,size_tqueueSize,size_tnWorkers)`

Lines changed: 1 addition & 1 deletion

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`	`voidMtmLockNode(intnodeId,LWLockModemode)`

Comments

(0)