diff options
| author | Robert Haas <rhaas@postgresql.org> | 2014-07-30 11:25:58 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2014-07-30 11:34:06 -0400 |
| commit | e280c630a87e1b8325770c6073097d109d79a00f (patch) | |
| tree | 5eaccc328330b234c60ac4624085c554e9abfb9f /src | |
| parent | 232f1475dce23e2fdd0568b35e9a7c470ae6c8ae (diff) | |
| download | postgresql-e280c630a87e1b8325770c6073097d109d79a00f.tar.gz postgresql-e280c630a87e1b8325770c6073097d109d79a00f.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 198c97ecf5d..b190cf51136 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -4668,6 +4668,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); |