Fast shutdown stop should forcibly disconnect any active backends, even

if a smart shutdown is already in progress. Backpatch to 8.3, this was broken
in the patch that introduced "dead-end backends".

Per report by Itagaki Takahiro, patch by Fujii Masao.
This commit is contained in:
Heikki Linnakangas 2009-08-07 05:58:55 +00:00
parent dcb2bda9b7
commit 06f1f53ea9

View File

@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.586 2009/08/06 09:50:22 mha Exp $ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.587 2009/08/07 05:58:55 heikki Exp $
* *
* NOTES * NOTES
* *
@ -2094,6 +2094,7 @@ pmdie(SIGNAL_ARGS)
} }
if (pmState == PM_RUN || if (pmState == PM_RUN ||
pmState == PM_WAIT_BACKUP || pmState == PM_WAIT_BACKUP ||
pmState == PM_WAIT_BACKENDS ||
pmState == PM_RECOVERY_CONSISTENT) pmState == PM_RECOVERY_CONSISTENT)
{ {
ereport(LOG, ereport(LOG,