mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-15 08:20:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tom Lane 2002-09-30 20:47:22 +00:00
parent c6ec2a8ba5
commit 96464fa37c
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/commands/async.c
View File

@ -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)
{
/*

7
src/backend/tcop/postgres.c
View File

@ -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 */
/*