diff options
| author | Noah Misch <noah@leadboat.com> | 2013-09-11 20:10:15 -0400 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2013-09-11 20:14:41 -0400 |
| commit | 9553d0f03b17d96af304f767c596dace953c736e (patch) | |
| tree | 89457d2adb1d2af465ceb0a9b082ca2371a8d633 | |
| parent | 994f68d15b8c622eeda77675121861d1c9b7d34d (diff) | |
| download | postgresql-9553d0f03b17d96af304f767c596dace953c736e.tar.gz postgresql-9553d0f03b17d96af304f767c596dace953c736e.zip | |
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.
| -rw-r--r-- | src/backend/tcop/postgres.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 363b60891e0..3e63df70576 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -2611,6 +2611,13 @@ quickdie(SIGNAL_ARGS) 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 * mention that we may have interrupted the guts of OpenSSL or some |