1
0
mirror of https://github.com/postgres/postgres.git synced 2025-06-27 23:21:58 +03:00

Fix elog(FATAL) before PostmasterMain() or just after fork().

Since commit 97550c0711, 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
This commit is contained in:
Noah Misch
2024-12-10 13:51:59 -08:00
parent 4922ede979
commit 315264d701
3 changed files with 5 additions and 2 deletions

View File

@ -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();
/*

View File

@ -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

View File

@ -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);