Permalink
Browse files

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.
  • Loading branch information...
1 parent a49d0b7 commit d41cb869aad493178777b6e6e8d1425535349acb @nmisch nmisch committed Sep 12, 2013
Showing with 7 additions and 0 deletions.
  1. +7 −0 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

0 comments on commit d41cb86

Please sign in to comment.