Back-patch fix for bad SIGUSR2 interrupt handling during backend shutdown.

diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 3195f5fc0b828c3df0fea31b031e0820e1dc26f6..55d5e13975555634006e231fcb4f285c0da868f1 100644 (file)
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.81 2001/10/25 05:49:23 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.81.2.1 2002/09/30 20:47:22 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -607,6 +607,10 @@ Async_NotifyHandler(SIGNAL_ARGS)
         * ever turned on.
         */
 
+       /* Don't joggle the elbow of proc_exit */
+       if (proc_exit_inprogress)
+               return;
+
        if (notifyInterruptEnabled)
        {
                /*

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 7a1b148edb8f21b3bc240ac5bd66c10d0b528b2f..cdd8a39cfad9b4eac30d9bde244f1a99e4f8427a 100644 (file)
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.245.2.2 2002/02/27 23:17:01 tgl Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.245.2.3 2002/09/30 20:47:22 tgl Exp $
  *
  * NOTES
  *       this is the "main" module of the postgres backend and
@@ -1103,12 +1103,14 @@ ProcessInterrupts(void)
                ProcDiePending = false;
                QueryCancelPending = false;             /* ProcDie trumps QueryCancel */
                ImmediateInterruptOK = false;   /* not idle anymore */
+               DisableNotifyInterrupt();
                elog(FATAL, "This connection has been terminated by the administrator.");
        }
        if (QueryCancelPending)
        {
                QueryCancelPending = false;
                ImmediateInterruptOK = false;   /* not idle anymore */
+               DisableNotifyInterrupt();
                elog(ERROR, "Query was cancelled.");
        }
        /* If we get here, do nothing (probably, QueryCancelPending was reset) */
@@ -1704,7 +1706,7 @@ PostgresMain(int argc, char *argv[], const char *username)
        if (!IsUnderPostmaster)
        {
                puts("\nPOSTGRES backend interactive interface ");
-               puts("$Revision: 1.245.2.2 $ $Date: 2002/02/27 23:17:01 $\n");
+               puts("$Revision: 1.245.2.3 $ $Date: 2002/09/30 20:47:22 $\n");
        }
 
        /*
@@ -1751,6 +1753,7 @@ PostgresMain(int argc, char *argv[], const char *username)
                QueryCancelPending = false;
                InterruptHoldoffCount = 1;
                CritSectionCount = 0;   /* should be unnecessary, but... */
+               DisableNotifyInterrupt();
                debug_query_string = NULL;              /* used by pgmonitor */
 
                /*