From b1fc543b5d864858f0c21f95e814c9964c9322d4 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Fri, 7 Aug 2009 06:00:09 +0000 Subject: [PATCH] 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. --- src/backend/postmaster/postmaster.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 9f41a433b6..884b738629 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.551.2.1 2008/06/27 01:53:31 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.551.2.2 2009/08/07 06:00:09 heikki Exp $ * * NOTES * @@ -1994,7 +1994,8 @@ pmdie(SIGNAL_ARGS) if (StartupPID != 0) signal_child(StartupPID, SIGTERM); - if (pmState == PM_RUN) + if (pmState == PM_RUN || + pmState == PM_WAIT_BACKENDS) { ereport(LOG, (errmsg("aborting any active transactions"))); -- 2.50.0