diff options
| author | Noah Misch | 2024-12-10 21:51:59 +0000 |
|---|---|---|
| committer | Noah Misch | 2024-12-10 21:51:59 +0000 |
| commit | 8b9cbf4922756d912309567f83f81e41f1737ac7 (patch) | |
| tree | 9f69b467a34faa2403811f52971eb50042b74923 /src/backend/postmaster | |
| parent | 939b0908c87a7d82171097189b855e5d0d2dd716 (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/[email protected]
Diffstat (limited to 'src/backend/postmaster')
| -rw-r--r-- | src/backend/postmaster/fork_process.c | 2 | ||||
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/backend/postmaster/fork_process.c b/src/backend/postmaster/fork_process.c index 5e42a74ab5f..b3010e3e36a 100644 --- a/src/backend/postmaster/fork_process.c +++ b/src/backend/postmaster/fork_process.c @@ -19,6 +19,7 @@ #include <unistd.h> #include "libpq/pqsignal.h" +#include "miscadmin.h" #include "postmaster/fork_process.h" #ifndef WIN32 @@ -66,6 +67,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 ce00f4032ee..f0f9c66487c 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -1899,14 +1899,13 @@ 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. */ void InitProcessGlobals(void) { - MyProcPid = getpid(); MyStartTimestamp = GetCurrentTimestamp(); MyStartTime = timestamptz_to_time_t(MyStartTimestamp); |