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 dbb0ece53b63c75235222f5cb0e666fb9db0220a..fad472e8895c43b28ed268c330cca455fd1f9ae9 100644 (file)
--- 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,