From f0d76a515e88a2709e23693c2f9cfb979063dfe2 Mon Sep 17 00:00:00 2001 From: Noah Misch Date: Wed, 11 Sep 2013 20:10:15 -0400 Subject: [PATCH] Ignore interrupts during quickdie(). Once the administrator has called for an immediate shutdown or a backend crash has triggered a reinitialization, no mere SIGINT or SIGTERM should change that course. Such derailment remains possible when the signal arrives before quickdie() blocks signals. That being a narrow race affecting most PostgreSQL signal handlers in some way, leave it for another patch. Back-patch this to all supported versions. --- src/backend/tcop/postgres.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index ad33ae079bd..c7f36486ff7 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -2570,6 +2570,13 @@ quickdie(SIGNAL_ARGS) sigaddset(&BlockSig, SIGQUIT); /* prevent nested calls */ PG_SETMASK(&BlockSig); + /* + * Prevent interrupts while exiting; though we just blocked signals that + * would queue new interrupts, one may have been pending. We don't want a + * quickdie() downgraded to a mere query cancel. + */ + HOLD_INTERRUPTS(); + /* * If we're aborting out of client auth, don't risk trying to send * anything to the client; we will likely violate the protocol, not to