Handle Warn_restart_ready properly in SIGTERM safety patch.

bmomjian · bmomjian · commit 3e2aef58a28f · 2004-04-16T12:59:05.000Z
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.133 2004/04/11 00:54:45 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.134 2004/04/16 12:59:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -448,6 +448,10 @@ errfinish(int dummy,...)
 			if (in_fatal_exit)
 				ereport(PANIC, (errmsg("fatal error during fatal exit, giving up")));
 
+			/* not safe to longjump */
+			if (!Warn_restart_ready || proc_exit_inprogress)
+				proc_exit(proc_exit_inprogress || !IsUnderPostmaster);
+
 			/* We will exit the backend by simulating a client EOF */
 			in_fatal_exit = true;
 		}

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.133 2004/04/11 00:54:45 momjian Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.134 2004/04/16 12:59:05 momjian Exp $`
`41`	`41`	`*`
`42`	`42`	`*-------------------------------------------------------------------------`
`43`	`43`	`*/`
`@@ -448,6 +448,10 @@ errfinish(int dummy,...)`
`448`	`448`	`if (in_fatal_exit)`
`449`	`449`	`ereport(PANIC, (errmsg("fatal error during fatal exit, giving up")));`
`450`	`450`
	`451`	`+ /* not safe to longjump */`
	`452`	`+ if (!Warn_restart_ready \|\| proc_exit_inprogress)`
	`453`	`+ proc_exit(proc_exit_inprogress \|\| !IsUnderPostmaster);`
	`454`	`+`
`451`	`455`	`/* We will exit the backend by simulating a client EOF */`
`452`	`456`	`in_fatal_exit = true;`
`453`	`457`	`}`