diff options
| author | Noah Misch | 2013-09-12 00:10:15 +0000 |
|---|---|---|
| committer | Noah Misch | 2013-09-12 00:10:15 +0000 |
| commit | d41cb869aad493178777b6e6e8d1425535349acb (patch) | |
| tree | f714c71f6ee14a75ae3ddc09cbfecf407d4707ce /src/backend/tcop/postgres.c | |
| parent | a49d0b75ce41a5480777f0957d5119cb2f393414 (diff) | |
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.
Diffstat (limited to 'src/backend/tcop/postgres.c')
| -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 e56dbfb8006..1eaf287eec9 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -2525,6 +2525,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 |