From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Fri, 7 Aug 2009 05:58:55 +0000 (+0000)
Subject: Fast shutdown stop should forcibly disconnect any active backends, even
X-Git-Tag: REL8_5_ALPHA1~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06f1f53ea9bbbcdebc228d8422182dc9da75ec73;p=thirdparty%2Fpostgresql.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 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,