mirror of
https://github.com/postgres/postgres.git
synced 2025-06-11 20:28:21 +03:00
Fix IsUnderPostmaster/EXEC_BACKEND confusion
This commit is contained in:
@ -359,6 +359,10 @@ AuxiliaryProcessMain(int argc, char *argv[])
|
|||||||
SetProcessingMode(BootstrapProcessing);
|
SetProcessingMode(BootstrapProcessing);
|
||||||
IgnoreSystemIndexes = true;
|
IgnoreSystemIndexes = true;
|
||||||
|
|
||||||
|
/* Initialize MaxBackends (if under postmaster, was done already) */
|
||||||
|
if (!IsUnderPostmaster)
|
||||||
|
InitializeMaxBackends();
|
||||||
|
|
||||||
BaseInit();
|
BaseInit();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -3654,10 +3654,8 @@ PostgresMain(int argc, char *argv[], const char *username)
|
|||||||
*/
|
*/
|
||||||
CreateDataDirLockFile(false);
|
CreateDataDirLockFile(false);
|
||||||
|
|
||||||
/* In EXEC_BACKEND, this was set via BackendParameters */
|
/* Initialize MaxBackends (if under postmaster, was done already) */
|
||||||
#ifndef EXEC_BACKEND
|
|
||||||
InitializeMaxBackends();
|
InitializeMaxBackends();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Early initialization */
|
/* Early initialization */
|
||||||
|
@ -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
|
* This must be called after modules have had the chance to register background
|
||||||
* workers in shared_preload_libraries, and before shared memory size is
|
* workers in shared_preload_libraries, and before shared memory size is
|
||||||
* determined.
|
* 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
|
void
|
||||||
InitializeMaxBackends(void)
|
InitializeMaxBackends(void)
|
||||||
|
Reference in New Issue
Block a user