summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Misch2024-12-10 21:51:59 +0000
committerNoah Misch2024-12-10 21:51:59 +0000
commit8b9cbf4922756d912309567f83f81e41f1737ac7 (patch)
tree9f69b467a34faa2403811f52971eb50042b74923
parent939b0908c87a7d82171097189b855e5d0d2dd716 (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]
-rw-r--r--src/backend/main/main.c2
-rw-r--r--src/backend/postmaster/fork_process.c2
-rw-r--r--src/backend/postmaster/postmaster.c3
-rw-r--r--src/port/pqsignal.c3
4 files changed, 6 insertions, 4 deletions
diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index 3acb46bd464..2d98d97e8d8 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -32,6 +32,7 @@
#include "bootstrap/bootstrap.h"
#include "common/username.h"
+#include "miscadmin.h"
#include "postmaster/postmaster.h"
#include "tcop/tcopprot.h"
#include "utils/help_config.h"
@@ -109,6 +110,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 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);
diff --git a/src/port/pqsignal.c b/src/port/pqsignal.c
index 6ca2d4e20a8..bdaa9f10c8a 100644
--- a/src/port/pqsignal.c
+++ b/src/port/pqsignal.c
@@ -74,8 +74,7 @@ static volatile pqsigfunc pqsignal_handlers[PG_NSIG];
/*
* Except when called with SIG_IGN or SIG_DFL, pqsignal() sets up this function
* as the handler for all signals. This wrapper handler function checks that
- * it is called within a process that the server knows about (i.e., any process
- * that has called InitProcessGlobals(), such as a client backend), and not a
+ * it is called within a process that knew to maintain MyProcPid, and not a
* child process forked by system(3), etc. This check ensures that such child
* processes do not modify shared memory, which is often detrimental. If the
* check succeeds, the function originally provided to pqsignal() is called.