diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2009-08-07 05:58:55 +0000 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2009-08-07 05:58:55 +0000 |
| commit | 06f1f53ea9bbbcdebc228d8422182dc9da75ec73 (patch) | |
| tree | b8113c271516597e10f0feb8e9a3db5747cacf92 /src | |
| parent | dcb2bda9b7042dbf43f876c94ebf35d951de10e9 (diff) | |
| download | postgresql-06f1f53ea9bbbcdebc228d8422182dc9da75ec73.tar.gz postgresql-06f1f53ea9bbbcdebc228d8422182dc9da75ec73.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index e558348c964..e21d8e885b2 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -37,7 +37,7 @@ * * * 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 * @@ -2094,6 +2094,7 @@ pmdie(SIGNAL_ARGS) } if (pmState == PM_RUN || pmState == PM_WAIT_BACKUP || + pmState == PM_WAIT_BACKENDS || pmState == PM_RECOVERY_CONSISTENT) { ereport(LOG, |