diff options
author | Andres Freund <andres@anarazel.de> | 2021-08-05 14:37:09 -0700 |
---|---|---|
committer | Andres Freund <andres@anarazel.de> | 2021-08-05 15:36:59 -0700 |
commit | b406478b87e2234c0be4ca4105eee3bb466a646b (patch) | |
tree | afe7c717314d513a9c372604d010b53a601763d4 /src/backend/tcop/postgres.c | |
parent | 0de13bbc47d19c95de132cc85c341fdab079c170 (diff) | |
download | postgresql-b406478b87e2234c0be4ca4105eee3bb466a646b.tar.gz postgresql-b406478b87e2234c0be4ca4105eee3bb466a646b.zip |
process startup: Always call Init[Auxiliary]Process() before BaseInit().
For EXEC_BACKEND InitProcess()/InitAuxiliaryProcess() needs to have been
called well before we call BaseInit(), as SubPostmasterMain() needs LWLocks to
work. Having the order of initialization differ between platforms makes it
unnecessarily hard to understand the system and to add initialization points
for new subsystems without a lot of duplication.
To be able to change the order, BaseInit() cannot trigger
CreateSharedMemoryAndSemaphores() anymore - obviously that needs to have
happened before we can call InitProcess(). It seems cleaner to create shared
memory explicitly in single user/bootstrap mode anyway.
After this change the separation of bufmgr initialization into
InitBufferPoolAccess() / InitBufferPoolBackend() is not meaningful anymore so
the latter is removed.
Author: Andres Freund <andres@anarazel.de>
Reviewed-By: Kyotaro Horiguchi <horikyota.ntt@gmail.com>
Discussion: https://postgr.es/m/20210802164124.ufo5buo4apl6yuvs@alap3.anarazel.de
Diffstat (limited to 'src/backend/tcop/postgres.c')
-rw-r--r-- | src/backend/tcop/postgres.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 530caa520b8..58b5960e27d 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -4050,10 +4050,9 @@ PostgresMain(int argc, char *argv[], /* Initialize MaxBackends (if under postmaster, was done already) */ InitializeMaxBackends(); - } - /* Early initialization */ - BaseInit(); + CreateSharedMemoryAndSemaphores(); + } /* * Create a per-backend PGPROC struct in shared memory, except in the @@ -4068,6 +4067,9 @@ PostgresMain(int argc, char *argv[], InitProcess(); #endif + /* Early initialization */ + BaseInit(); + /* We need to allow SIGINT, etc during the initial transaction */ PG_SETMASK(&UnBlockSig); |