sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-04 00:02:52 -05:00
Code Issues Projects Releases Wiki Activity

Fix IsUnderPostmaster/EXEC_BACKEND confusion

Browse Source
This commit is contained in:
Alvaro Herrera 2013-01-02 18:39:20 -03:00
parent 15658911d9
commit 84f6fb81b8
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/bootstrap/bootstrap.c
View File

@ -359,6 +359,10 @@ AuxiliaryProcessMain(int argc, char *argv[])
SetProcessingMode(BootstrapProcessing);
IgnoreSystemIndexes = true;
/* Initialize MaxBackends (if under postmaster, was done already) */
if (!IsUnderPostmaster)
InitializeMaxBackends();
BaseInit();
/*

4
src/backend/tcop/postgres.c
View File

@ -3654,10 +3654,8 @@ PostgresMain(int argc, char *argv[], const char *username)
*/
CreateDataDirLockFile(false);
/* In EXEC_BACKEND, this was set via BackendParameters */
#ifndef EXEC_BACKEND
/* Initialize MaxBackends (if under postmaster, was done already) */
InitializeMaxBackends();
#endif
}
/* Early initialization */

5
src/backend/utils/init/postinit.c
View File

@ -427,6 +427,11 @@ pg_split_opts(char **argv, int *argcp, char *optstr)
* This must be called after modules have had the chance to register background
* workers in shared_preload_libraries, and before shared memory size is
* determined.
*
* Note that in EXEC_BACKEND environment, the value is passed down from
* postmaster to subprocesses via BackendParameters in SubPostmasterMain; only
* postmaster itself and processes not under postmaster control should call
* this.
*/
void
InitializeMaxBackends(void)