Commit3c4ab3f

committed

Exit backend from SIGTERM or FATAL by simulating client EOF, rather than

calling proc_exit() directly. This should make SIGTERM more reliable.

1 parent1934055 commit3c4ab3fCopy full SHA for 3c4ab3f

File tree

+18

-6

lines changed

+18

-6

lines changed

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.398 2004/04/07 05:05:49 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.399 2004/04/11 00:54:44 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -2938,7 +2938,10 @@ PostgresMain(int argc, char argv[], const char username)`
`2938`	`2938`	`/*`
`2939`	`2939`	`* (3) read a command (loop blocks here)`
`2940`	`2940`	`*/`
`2941`		`-firstchar=ReadCommand(&input_message);`
	`2941`	`+if (!in_fatal_exit)`
	`2942`	`+firstchar=ReadCommand(&input_message);`
	`2943`	`+else`
	`2944`	`+firstchar=EOF;`
`2942`	`2945`
`2943`	`2946`	`/*`
`2944`	`2947`	`* (4) disable async signal conditions again.`
`@@ -3170,7 +3173,8 @@ PostgresMain(int argc, char argv[], const char username)`
`3170`	`3173`	`* Otherwise it will fail to be called during other`
`3171`	`3174`	`* backend-shutdown scenarios.`
`3172`	`3175`	`*/`
`3173`		`-proc_exit(0);`
	`3176`	`+proc_exit(!in_fatal_exit ?0 :proc_exit_inprogress\|\|`
	`3177`	`+!IsUnderPostmaster);`
`3174`	`3178`
`3175`	`3179`	`case'd':/* copy data */`
`3176`	`3180`	`case'c':/* copy done */`

Lines changed: 9 additions & 2 deletions

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.132 2004/04/05 03:02:06 momjian Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.133 2004/04/11 00:54:45 momjian Exp $`
`41`	`41`	`*`
`42`	`42`	`*-------------------------------------------------------------------------`
`43`	`43`	`*/`
`@@ -72,6 +72,8 @@ PGErrorVerbosity Log_error_verbosity = PGERROR_VERBOSE;`
`72`	`72`	`charLog_line_prefix=NULL;/ format for extra log line info */`
`73`	`73`	`unsignedintLog_destination;`
`74`	`74`
	`75`	`+boolin_fatal_exit= false;`
	`76`	`+`
`75`	`77`	`#ifdefHAVE_SYSLOG`
`76`	`78`	`charSyslog_facility;/ openlog() parameters */`
`77`	`79`	`char*Syslog_ident;`
`@@ -442,7 +444,12 @@ errfinish(int dummy,...)`
`442`	`444`	`*/`
`443`	`445`	`fflush(stdout);`
`444`	`446`	`fflush(stderr);`
`445`		`-proc_exit(proc_exit_inprogress\|\| !IsUnderPostmaster);`
	`447`	`+`
	`448`	`+if (in_fatal_exit)`
	`449`	`+ereport(PANIC, (errmsg("fatal error during fatal exit, giving up")));`
	`450`	`+`
	`451`	`+/* We will exit the backend by simulating a client EOF */`
	`452`	`+in_fatal_exit= true;`
`446`	`453`	`}`
`447`	`454`
`448`	`455`	`/*`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $PostgreSQL: pgsql/src/include/tcop/tcopprot.h,v 1.64 2004/04/07 05:05:50 momjian Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/include/tcop/tcopprot.h,v 1.65 2004/04/11 00:54:45 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`* OLD COMMENTS`
`13`	`13`	`* This file was created so that other c files could get the two`
`@@ -34,6 +34,7 @@ extern bool log_hostname;`
`34`	`34`	`externDLLIMPORTconstchar*debug_query_string;`
`35`	`35`	`externchar*rendezvous_name;`
`36`	`36`	`externintmax_stack_depth;`
	`37`	`+externboolin_fatal_exit;`
`37`	`38`
`38`	`39`	`/* GUC-configurable parameters */`
`39`	`40`

Comments

(0)