Clear QueryCancel and ProcDiePending at start of proc_exit, to ensure

tglsfdc · tglsfdc · commit 542b7c644534 · 2001-01-07T04:30:41.000Z
that leftover cancel/die requests cannot interfere with exit activities.
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.58 2000/12/30 01:20:55 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.59 2001/01/07 04:30:41 tgl Exp $
  *
  * NOTES
  *
@@ -126,6 +126,14 @@ proc_exit(int code)
 	 */
 	proc_exit_inprogress = true;
 
+	/*
+	 * Forget any pending cancel or die requests; we're doing our best
+	 * to close up shop already.  Note that the signal handlers will not
+	 * set these flags again, now that proc_exit_inprogress is set.
+	 */
+	QueryCancel = false;
+	ProcDiePending = false;
+
 	if (DebugLvl > 1)
 		elog(DEBUG, "proc_exit(%d)", code);
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.58 2000/12/30 01:20:55 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.59 2001/01/07 04:30:41 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`*`
`@@ -126,6 +126,14 @@ proc_exit(int code)`
`126`	`126`	`*/`
`127`	`127`	`proc_exit_inprogress = true;`
`128`	`128`
	`129`	`+ /*`
	`130`	`+ * Forget any pending cancel or die requests; we're doing our best`
	`131`	`+ * to close up shop already. Note that the signal handlers will not`
	`132`	`+ * set these flags again, now that proc_exit_inprogress is set.`
	`133`	`+ */`
	`134`	`+ QueryCancel = false;`
	`135`	`+ ProcDiePending = false;`
	`136`	`+`
`129`	`137`	`if (DebugLvl > 1)`
`130`	`138`	`elog(DEBUG, "proc_exit(%d)", code);`
`131`	`139`