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

diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index f8f7ebbd4454462c1a53e7f8cd8899a8d0c66ddf..f243a8d793fc38fce7d2d7502b03486f7bae4017 100644 (file)
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -37,6 +37,7 @@
 
 #include "bootstrap/bootstrap.h"
 #include "common/username.h"
+#include "miscadmin.h"
 #include "port/atomics.h"
 #include "postmaster/postmaster.h"
 #include "storage/spin.h"
@@ -99,6 +100,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 c75be03d2c3fed912e73ac5ef8e6d36ef6a911b9..bc1f95ec009214ebbadba5b90e77760d2d28e8d8 100644 (file)
--- 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 918363c38bc5dc34760c8f669ed8b50b8e1ce9f0..e0210d091e48484be0bd69e34bd2a8fdcdc4b605 100644 (file)
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -2690,14 +2690,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);