postgres.git / summary / log / commit / refs
commit aeebacff114634ffa07b5299ee6c41b219717bc3
Author: Robert Haas <rhaas@postgresql.org>
Date: Wed Jul 30 15:25:58 2014 +0000
First released in: 9.5.0, 9.3.6, 9.4.0
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.
src/backend/postmaster/postmaster.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 9548caa0aeb..39fa5641914 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);
[parent: 98c5fe5d0df8]