From: Noah Misch <noah@leadboat.com>
Date: Thu, 12 Sep 2013 00:10:15 +0000 (-0400)
Subject: Ignore interrupts during quickdie().
X-Git-Tag: REL9_4_BETA1~1149
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d41cb869aad493178777b6e6e8d1425535349acb;p=postgresql

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

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index e56dbfb800..1eaf287eec 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -2524,6 +2524,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