diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2009-08-07 05:59:42 +0000 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2009-08-07 05:59:42 +0000 |
| commit | e1f0b9bf94a65bef4ca778f3ea0de4deab6cbcc8 (patch) | |
| tree | 8364b5c0cce3026f704b28de37a8d846b5d6cf89 | |
| parent | 53890f8073894d0793b1619270d069cf04705fdf (diff) | |
| download | postgresql-e1f0b9bf94a65bef4ca778f3ea0de4deab6cbcc8.tar.gz postgresql-e1f0b9bf94a65bef4ca778f3ea0de4deab6cbcc8.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.
| -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 41bb8e4ab0a..49a1502f8da 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.583.2.1 2009/07/08 18:55:42 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.583.2.2 2009/08/07 05:59:42 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, |