diff options
| author | Noah Misch <noah@leadboat.com> | 2024-12-10 13:51:59 -0800 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2024-12-10 13:52:02 -0800 |
| commit | 6151769f6ef540a71c131165d27426a0bcd1c009 (patch) | |
| tree | d279af025333d4b0a1fe49cebadd359eb7eab3d9 /src | |
| parent | 0fbcb9da181452e236b5aca6bf00c20ebcd7ec6b (diff) | |
Fix elog(FATAL) before PostmasterMain() or just after fork().
Since commit 97550c0711972a9856b5db751539bbaf2f88884c, these failed with
"PANIC: proc_exit() called in child process" due to uninitialized or
stale MyProcPid. That was reachable if close() failed in
ClosePostmasterPorts() or setlocale(category, "C") failed, both
unlikely. Back-patch to v13 (all supported versions).
Discussion: https://postgr.es/m/20241208034614.45.nmisch@google.com
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/main/main.c | 2 | ||||
| -rw-r--r-- | src/backend/postmaster/fork_process.c | 2 | ||||
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/backend/main/main.c b/src/backend/main/main.c index 84f93cd1556..3d861d62612 100644 --- a/src/backend/main/main.c +++ b/src/backend/main/main.c @@ -33,6 +33,7 @@ #include "bootstrap/bootstrap.h" #include "common/username.h" +#include "miscadmin.h" #include "port/atomics.h" #include "postmaster/postmaster.h" #include "storage/s_lock.h" @@ -96,6 +97,7 @@ main(int argc, char *argv[]) * localization of messages may not work right away, and messages won't go * anywhere but stderr until GUC settings get loaded. */ + MyProcPid = getpid(); MemoryContextInit(); /* diff --git a/src/backend/postmaster/fork_process.c b/src/backend/postmaster/fork_process.c index def3cee37e2..0ebfb05398d 100644 --- a/src/backend/postmaster/fork_process.c +++ b/src/backend/postmaster/fork_process.c @@ -20,6 +20,7 @@ #include <openssl/rand.h> #endif +#include "miscadmin.h" #include "postmaster/fork_process.h" #ifndef WIN32 @@ -63,6 +64,7 @@ fork_process(void) if (result == 0) { /* fork succeeded, in child */ + MyProcPid = getpid(); #ifdef LINUX_PROFILE setitimer(ITIMER_PROF, &prof_itimer, NULL); #endif diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 9c57f4aae32..e145e72b972 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -2649,7 +2649,7 @@ ClosePostmasterPorts(bool am_syslogger) /* - * InitProcessGlobals -- set MyProcPid, MyStartTime[stamp], random seeds + * InitProcessGlobals -- set MyStartTime[stamp], random seeds * * Called early in the postmaster and every backend. */ @@ -2658,7 +2658,6 @@ InitProcessGlobals(void) { unsigned int rseed; - MyProcPid = getpid(); MyStartTimestamp = GetCurrentTimestamp(); MyStartTime = timestamptz_to_time_t(MyStartTimestamp); |