From: Heikki Linnakangas <heikki@enterprisedb.com>
Date: Fri, 7 Aug 2009 05:58:55 +0000 (+0000)
Subject: Fast shutdown stop should forcibly disconnect any active backends, even
X-Git-Url: http://git.postgresql.org/gitweb/static/session/index.html?a=commitdiff_plain;h=340951c06d92275d0e338bb234947a5bb58cddc3;p=users%2Fsimon%2Fpostgres.git

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.
---

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,