summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeikki Linnakangas2009-08-07 05:58:55 +0000
committerHeikki Linnakangas2009-08-07 05:58:55 +0000
commit340951c06d92275d0e338bb234947a5bb58cddc3 (patch)
tree65c25be034993e686cd265e291ca547f571f2bcd
parent64faa8379372e2fd06c1cd128cb4d88f15900968 (diff)
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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index dbb0ece53b..fad472e889 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -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,