From c2d8fb9f2779ff828ee3dfb9050e5866aa4011bb Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Mon, 13 Jan 2025 23:30:46 -0500 Subject: [PATCH v4 3/7] postmaster: Don't repeatedly transition to crashing state Previously HandleChildCrash() skipped logging and signalling child exits if already in an immediate shutdown or FatalError, but still transitioned server state in response to a crash. That's redundant. To make it easier to combine different paths for entering FatalError state, only do so once. Author: Reviewed-by: Discussion: https://postgr.es/m/ Backpatch: --- src/backend/postmaster/postmaster.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 8153edc446c..939b1b2ef82 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -2676,8 +2676,6 @@ CleanupBackend(PMChild *bp, static void HandleChildCrash(int pid, int exitstatus, const char *procname) { - bool take_action; - /* * We only log messages and send signals if this is the first process * crash and we're not doing an immediate shutdown; otherwise, we're only @@ -2685,15 +2683,13 @@ HandleChildCrash(int pid, int exitstatus, const char *procname) * signaled children, nonzero exit status is to be expected, so don't * clutter log. */ - take_action = !FatalError && Shutdown != ImmediateShutdown; + if (FatalError || Shutdown == ImmediateShutdown) + return; - if (take_action) - { - LogChildExit(LOG, procname, pid, exitstatus); - ereport(LOG, - (errmsg("terminating any other active server processes"))); - SetQuitSignalReason(PMQUIT_FOR_CRASH); - } + LogChildExit(LOG, procname, pid, exitstatus); + ereport(LOG, + (errmsg("terminating any other active server processes"))); + SetQuitSignalReason(PMQUIT_FOR_CRASH); /* * Signal all other child processes to exit. The crashed process has @@ -2702,8 +2698,7 @@ HandleChildCrash(int pid, int exitstatus, const char *procname) * We could exclude dead-end children here, but at least when sending * SIGABRT it seems better to include them. */ - if (take_action) - TerminateChildren(send_abort_for_crash ? SIGABRT : SIGQUIT); + TerminateChildren(send_abort_for_crash ? SIGABRT : SIGQUIT); if (Shutdown != ImmediateShutdown) FatalError = true; -- 2.45.2.746.g06e570c0df.dirty