From: Robert Haas <rhaas@postgresql.org>
Date: Wed, 30 Jul 2014 15:25:58 +0000 (-0400)
Subject: Fix mishandling of background worker PGPROCs in EXEC_BACKEND builds.
X-Git-Tag: REL9_4_BETA3~130
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aeebacff114634ffa07b5299ee6c41b219717bc3;p=postgresql

Fix mishandling of background worker PGPROCs in EXEC_BACKEND builds.

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
index 9548caa0ae..39fa564191 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -4672,6 +4672,9 @@ SubPostmasterMain(int argc, char *argv[])
 	{
 		int			shmem_slot;
 
+		/* do this as early as possible; in particular, before InitProcess() */
+		IsBackgroundWorker = true;
+
 		/* Close the postmaster's sockets */
 		ClosePostmasterPorts(false);