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 | 315264d70128445fd53de199e16bb8aa562cf36f (patch) | |
| tree | 08f64a8d9812fbc694fc9a86304946f87f945b25 | |
| parent | 4922ede979947bc2404e8675435184e61a57a530 (diff) | |
| download | postgresql-315264d70128445fd53de199e16bb8aa562cf36f.tar.gz postgresql-315264d70128445fd53de199e16bb8aa562cf36f.zip | |
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
| -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 350ef5b7d95..54fbb8492e0 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/spin.h" @@ -95,6 +96,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 62d068bc1e2..e4b938ca1f7 100644 --- a/src/backend/postmaster/fork_process.c +++ b/src/backend/postmaster/fork_process.c @@ -17,6 +17,7 @@ #include <sys/time.h> #include <unistd.h> +#include "miscadmin.h" #include "postmaster/fork_process.h" #ifndef WIN32 @@ -60,6 +61,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 0a4533251ba..82a8d4a6c39 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -2646,7 +2646,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. */ @@ -2655,7 +2655,6 @@ InitProcessGlobals(void) { unsigned int rseed; - MyProcPid = getpid(); MyStartTimestamp = GetCurrentTimestamp(); MyStartTime = timestamptz_to_time_t(MyStartTimestamp); |