Fix mishandling of background worker PGPROCs in EXEC_BACKEND builds.

robertmhaas · robertmhaas · commit 05c0059b3573 · 2014-07-30T12:10:20.000-04:00
InitProcess() relies on IsBackgroundWorker to decide whether the PGPROC
for a new backend should be taken from ProcGlobal's freeProcs or from
bgworkerFreeProcs.  In EXEC_BACKEND builds, InitProcess() is called
sooner than in non-EXEC_BACKEND builds, and IsBackgroundWorker wasn't
getting initialized soon enough.

Report by Noah Misch.  Diagnosis and fix by me.
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -4566,6 +4566,9 @@ SubPostmasterMain(int argc, char *argv[])
 	{
 		int			cookie;
 
+		/* do this as early as possible; in particular, before InitProcess() */
+		IsBackgroundWorker = true;
+
 		/* Close the postmaster's sockets */
 		ClosePostmasterPorts(false);
 

Original file line number	Diff line number	Diff line change
`@@ -4566,6 +4566,9 @@ SubPostmasterMain(int argc, char *argv[])`
`4566`	`4566`	`{`
`4567`	`4567`	`int cookie;`
`4568`	`4568`
	`4569`	`+ /* do this as early as possible; in particular, before InitProcess() */`
	`4570`	`+ IsBackgroundWorker = true;`
	`4571`	`+`
`4569`	`4572`	`/* Close the postmaster's sockets */`
`4570`	`4573`	`ClosePostmasterPorts(false);`
`4571`	`4574`