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 350ef5b7d9543ec3eca577d61acb023aeeb14044..54fbb8492e088571617d4a3b585e329d489536b6 100644 (file)
--- 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 62d068bc1e2e73b4acfe93a0f392fca985f2de4e..e4b938ca1f779c5c96ca1ae59dc0e7c5979c964d 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 0a4533251bac3a904aec82ff6cd20afb3ab987a1..82a8d4a6c393f1328578930b598402a9d3ee5663 100644 (file)
--- 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);