Commit98c120a

committed

Revert ill-conceived patch that made elog(FATAL) the same as elog(ERROR)

followed by seeing EOF from client. If we want a safe session-killcapability we will need to write one, not break our error handlingmechanism.

1 parentd79dc61 commit98c120aCopy full SHA for 98c120a

File tree

-22

lines changed

-22

lines changed

Lines changed: 3 additions & 7 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.425 2004/07/2705:11:03 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.426 2004/07/28 22:05:46 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -2932,10 +2932,7 @@ PostgresMain(int argc, char argv[], const char username)`
`2932`	`2932`	`/*`
`2933`	`2933`	`* (3) read a command (loop blocks here)`
`2934`	`2934`	`*/`
`2935`		`-if (!in_fatal_exit)`
`2936`		`-firstchar=ReadCommand(&input_message);`
`2937`		`-else`
`2938`		`-firstchar=EOF;`
	`2935`	`+firstchar=ReadCommand(&input_message);`
`2939`	`2936`
`2940`	`2937`	`/*`
`2941`	`2938`	`* (4) disable async signal conditions again.`
`@@ -3164,8 +3161,7 @@ PostgresMain(int argc, char argv[], const char username)`
`3164`	`3161`	`* Otherwise it will fail to be called during other`
`3165`	`3162`	`* backend-shutdown scenarios.`
`3166`	`3163`	`*/`
`3167`		`-proc_exit(!in_fatal_exit ?0 :proc_exit_inprogress\|\|`
`3168`		`-!IsUnderPostmaster);`
	`3164`	`+proc_exit(0);`
`3169`	`3165`
`3170`	`3166`	`case'd':/* copy data */`
`3171`	`3167`	`case'c':/* copy done */`

Lines changed: 2 additions & 13 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.142 2004/06/24 21:03:13 tgl Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.143 2004/07/28 22:05:46 tgl Exp $`
`41`	`41`	`*`
`42`	`42`	`*-------------------------------------------------------------------------`
`43`	`43`	`*/`
`@@ -72,8 +72,6 @@ PGErrorVerbosity Log_error_verbosity = PGERROR_VERBOSE;`
`72`	`72`	`charLog_line_prefix=NULL;/ format for extra log line info */`
`73`	`73`	`unsignedintLog_destination=LOG_DESTINATION_STDERR;`
`74`	`74`
`75`		`-boolin_fatal_exit= false;`
`76`		`-`
`77`	`75`	`#ifdefHAVE_SYSLOG`
`78`	`76`	`charSyslog_facility;/ openlog() parameters */`
`79`	`77`	`char*Syslog_ident;`
`@@ -444,16 +442,7 @@ errfinish(int dummy,...)`
`444`	`442`	`*/`
`445`	`443`	`fflush(stdout);`
`446`	`444`	`fflush(stderr);`
`447`		`-`
`448`		`-if (in_fatal_exit)`
`449`		`-ereport(PANIC, (errmsg("fatal error during fatal exit, giving up")));`
`450`		`-`
`451`		`-/* not safe to longjump */`
`452`		`-if (!Warn_restart_ready\|\|proc_exit_inprogress)`
`453`		`-proc_exit(proc_exit_inprogress\|\| !IsUnderPostmaster);`
`454`		`-`
`455`		`-/* We will exit the backend by simulating a client EOF */`
`456`		`-in_fatal_exit= true;`
	`445`	`+proc_exit(proc_exit_inprogress\|\| !IsUnderPostmaster);`
`457`	`446`	`}`
`458`	`447`
`459`	`448`	`/*`

Lines changed: 1 addition & 2 deletions

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.67 2004/06/11 01:09:22 tgl Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/include/tcop/tcopprot.h,v 1.68 2004/07/28 22:05:47 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`* OLD COMMENTS`
`13`	`13`	`* This file was created so that other c files could get the two`
`@@ -33,7 +33,6 @@ extern bool InError;`
`33`	`33`	`externCommandDestwhereToSendOutput;`
`34`	`34`	`externDLLIMPORTconstchar*debug_query_string;`
`35`	`35`	`externintmax_stack_depth;`
`36`		`-externboolin_fatal_exit;`
`37`	`36`
`38`	`37`	`/* GUC-configurable parameters */`
`39`	`38`

Comments

(0)