]> git.ipfire.org Git - thirdparty/postgresql.git/commitdiff
Fix elog(FATAL) before PostmasterMain() or just after fork().
authorNoah Misch <noah@leadboat.com>
Tue, 10 Dec 2024 21:51:59 +0000 (13:51 -0800)
committerNoah Misch <noah@leadboat.com>
Tue, 10 Dec 2024 21:52:02 +0000 (13:52 -0800)
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

src/backend/main/main.c
src/backend/postmaster/fork_process.c
src/backend/postmaster/postmaster.c

index ed11e8be7fab7b9cb434d74356aea09a2953649c..84d65aa4fbdcacc4371c2abc176c86b53940b488 100644 (file)
@@ -32,6 +32,7 @@
 
 #include "bootstrap/bootstrap.h"
 #include "common/username.h"
+#include "miscadmin.h"
 #include "port/atomics.h"
 #include "postmaster/postmaster.h"
 #include "storage/spin.h"
@@ -97,6 +98,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();
 
        /*
index 6f9c2765d6894de4def4a0dfcaefa5567a60c5b8..36e463aa15c136d147ff18c7c7949c98e1498d6c 100644 (file)
@@ -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
index b42aae41fce8386b44438bc73986e7ac1d433a03..110d05d13e281777419fca7d1c38225bc7f7b475 100644 (file)
@@ -2640,14 +2640,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);