Commit8cde1eb

committed

merge with mainstream multimaster

2 parents52ee2e9 +04a1922 commit8cde1ebCopy full SHA for 8cde1eb

File tree

+330

-129

lines changed

+330

-129

lines changed

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -707,8 +707,11 @@ static void MtmSender(Datum arg)`
`707`	`707`	`{`
`708`	`708`	`intnNodes=MtmMaxNodes;`
`709`	`709`	`inti;`
	`710`	`+MtmBuffer*txBuffer;`
`710`	`711`
`711`		`-MtmBuffertxBuffer= (MtmBuffer)palloc0(sizeof(MtmBuffer)*nNodes);`
	`712`	`+MtmBackgroundWorker= true;`
	`713`	`+`
	`714`	`+txBuffer= (MtmBuffer)palloc0(sizeof(MtmBuffer)nNodes);`
`712`	`715`	`MTM_ELOG(LOG,"Start arbiter sender %d",MyProcPid);`
`713`	`716`	`InitializeTimeouts();`
`714`	`717`
`@@ -795,6 +798,8 @@ static void MtmMonitor(Datum arg)`
`795`	`798`	`pqsignal(SIGQUIT,SetStop);`
`796`	`799`	`pqsignal(SIGTERM,SetStop);`
`797`	`800`
	`801`	`+MtmBackgroundWorker= true;`
	`802`	`+`
`798`	`803`	`/* We're now ready to receive signals */`
`799`	`804`	`BackgroundWorkerUnblockSignals();`
`800`	`805`
`@@ -831,7 +836,9 @@ static void MtmReceiver(Datum arg)`
`831`	`836`	`pqsignal(SIGINT,SetStop);`
`832`	`837`	`pqsignal(SIGQUIT,SetStop);`
`833`	`838`	`pqsignal(SIGTERM,SetStop);`
`834`		`-`
	`839`	`+`
	`840`	`+MtmBackgroundWorker= true;`
	`841`	`+`
`835`	`842`	`/* We're now ready to receive signals */`
`836`	`843`	`BackgroundWorkerUnblockSignals();`
`837`	`844`
`@@ -1146,4 +1153,3 @@ static void MtmReceiver(Datum arg)`
`1146`	`1153`	`}`
`1147`	`1154`	`proc_exit(1);/* force restart of this bgwroker */`
`1148`	`1155`	`}`
`1149`		`-`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ static void BgwPoolMainLoop(BgwPool* pool)`
`36`	`36`
`37`	`37`	`MTM_ELOG(LOG,"Start background worker %d, shutdown=%d",MyProcPid,pool->shutdown);`
`38`	`38`
	`39`	`+MtmBackgroundWorker= true;`
`39`	`40`	`MtmIsLogicalReceiver= true;`
`40`	`41`	`MtmPool=pool;`
`41`	`42`

Comments

(0)