Async_NotifyHandler must save and restore ImmediateInterruptOK. Fixes

tglsfdc · tglsfdc · commit f690acf1044b · 2003-02-18T02:53:29.000Z
known problem with failure to respond to 'pg_ctl stop -m fast', and
probable problems if SIGINT or SIGTERM arrives while processing a
SIGUSR2 interrupt that arrived while waiting for a new client query.
diff --git 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.91 2002/09/16 01:24:41 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.92 2003/02/18 02:53:29 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -599,6 +599,16 @@ Async_NotifyHandler(SIGNAL_ARGS)
 
 	if (notifyInterruptEnabled)
 	{
+		bool		save_ImmediateInterruptOK = ImmediateInterruptOK;
+
+		/*
+		 * We may be called while ImmediateInterruptOK is true; turn it off
+		 * while messing with the NOTIFY state.  (We would have to save
+		 * and restore it anyway, because PGSemaphore operations inside
+		 * ProcessIncomingNotify() might reset it.)
+		 */
+		ImmediateInterruptOK = false;
+
 		/*
 		 * I'm not sure whether some flavors of Unix might allow another
 		 * SIGUSR2 occurrence to recursively interrupt this routine. To
@@ -626,6 +636,13 @@ Async_NotifyHandler(SIGNAL_ARGS)
 					elog(LOG, "Async_NotifyHandler: done");
 			}
 		}
+
+		/*
+		 * Restore ImmediateInterruptOK, and check for interrupts if needed.
+		 */
+		ImmediateInterruptOK = save_ImmediateInterruptOK;
+		if (save_ImmediateInterruptOK)
+			CHECK_FOR_INTERRUPTS();
 	}
 	else
 	{

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.91 2002/09/16 01:24:41 tgl Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.92 2003/02/18 02:53:29 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -599,6 +599,16 @@ Async_NotifyHandler(SIGNAL_ARGS)`
`599`	`599`
`600`	`600`	`if (notifyInterruptEnabled)`
`601`	`601`	`{`
	`602`	`+ bool save_ImmediateInterruptOK = ImmediateInterruptOK;`
	`603`	`+`
	`604`	`+ /*`
	`605`	`+ * We may be called while ImmediateInterruptOK is true; turn it off`
	`606`	`+ * while messing with the NOTIFY state. (We would have to save`
	`607`	`+ * and restore it anyway, because PGSemaphore operations inside`
	`608`	`+ * ProcessIncomingNotify() might reset it.)`
	`609`	`+ */`
	`610`	`+ ImmediateInterruptOK = false;`
	`611`	`+`
`602`	`612`	`/*`
`603`	`613`	`* I'm not sure whether some flavors of Unix might allow another`
`604`	`614`	`* SIGUSR2 occurrence to recursively interrupt this routine. To`
`@@ -626,6 +636,13 @@ Async_NotifyHandler(SIGNAL_ARGS)`
`626`	`636`	`elog(LOG, "Async_NotifyHandler: done");`
`627`	`637`	`}`
`628`	`638`	`}`
	`639`	`+`
	`640`	`+ /*`
	`641`	`+ * Restore ImmediateInterruptOK, and check for interrupts if needed.`
	`642`	`+ */`
	`643`	`+ ImmediateInterruptOK = save_ImmediateInterruptOK;`
	`644`	`+ if (save_ImmediateInterruptOK)`
	`645`	`+ CHECK_FOR_INTERRUPTS();`
`629`	`646`	`}`
`630`	`647`	`else`
`631`	`648`	`{`