mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-21 08:29:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix things so that an error occuring during standalone-backend processing

Browse Source 
in initdb will result in exit(1), allowing the initdb script to realize
that there's something wrong.
This commit is contained in:
Tom Lane 2003-05-28 18:19:09 +00:00
parent aae078198d
commit 4df52b28f0
6 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/bootstrap/bootstrap.c
View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.159 2003/05/28 16:03:55 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.160 2003/05/28 18:19:09 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -838,7 +838,7 @@ BootstrapAlreadySeen(Oid id)
* ----------------
*/
static void
cleanup()
cleanup(void)
{
static int beenhere = 0;
@ -846,13 +846,13 @@ cleanup()
beenhere = 1;
else
{
elog(FATAL, "Memory manager fault: cleanup called twice.\n");
elog(FATAL, "Memory manager fault: cleanup called twice");
proc_exit(1);
}
if (boot_reldesc != NULL)
closerel(NULL);
CommitTransactionCommand();
proc_exit(Warnings);
proc_exit(Warnings ? 1 : 0);
}
/* ----------------

34
src/backend/utils/error/elog.c
View File

@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.110 2003/05/28 17:25:02 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.111 2003/05/28 18:19:09 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -410,18 +410,28 @@ errfinish(int dummy, ...)
/*
* For a FATAL error, we let proc_exit clean up and exit.
*
* If we have not yet entered the main backend loop (ie, we are in
* the postmaster or in backend startup), we also go directly to
* proc_exit. The same is true if anyone tries to report an error
* after proc_exit has begun to run. (It's proc_exit's
* responsibility to see that this doesn't turn into infinite
* recursion!) But in the latter case, we exit with nonzero exit
* code to indicate that something's pretty wrong. We also want
* to exit with nonzero exit code if not running under the
* postmaster (for example, if we are being run from the initdb
* script, we'd better return an error status).
* There are several other cases in which we treat ERROR as FATAL
* and go directly to proc_exit:
*
* 1. ExitOnAnyError mode switch is set (initdb uses this).
*
* 2. we have not yet entered the main backend loop (ie, we are in
* the postmaster or in backend startup); we have noplace to recover.
*
* 3. the error occurred after proc_exit has begun to run. (It's
* proc_exit's responsibility to see that this doesn't turn into
* infinite recursion!)
*
* In the last case, we exit with nonzero exit code to indicate that
* something's pretty wrong. We also want to exit with nonzero exit
* code if not running under the postmaster (for example, if we are
* being run from the initdb script, we'd better return an error
* status).
*/
if (elevel == FATAL || !Warn_restart_ready || proc_exit_inprogress)
if (elevel == FATAL ||
ExitOnAnyError ||
!Warn_restart_ready ||
proc_exit_inprogress)
{
/*
* fflush here is just to improve the odds that we get to see

4
src/backend/utils/init/globals.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.70 2003/05/28 17:25:02 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.71 2003/05/28 18:19:09 tgl Exp $
*
* NOTES
* Globals used all over the place should be declared here and not
@ -61,6 +61,8 @@ Oid MyDatabaseId = InvalidOid;
bool IsPostmasterEnvironment = false;
bool IsUnderPostmaster = false;
bool ExitOnAnyError = false;
int DateStyle = USE_ISO_DATES;
bool EuroDates = false;
bool HasCTZSet = false;

8
src/backend/utils/misc/guc.c
View File

@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>.
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.126 2003/05/27 17:55:50 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.127 2003/05/28 18:19:09 tgl Exp $
*
*--------------------------------------------------------------------
*/
@ -399,6 +399,12 @@ static struct config_bool
},
#endif
{
/* currently undocumented, so don't show in SHOW ALL */
{"exit_on_error", PGC_USERSET, GUC_NO_SHOW_ALL}, &ExitOnAnyError,
false, NULL, NULL
},
{
{"log_statement", PGC_SUSET}, &log_statement,
false, NULL, NULL

4
src/bin/initdb/initdb.sh
View File

@ -27,7 +27,7 @@
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
#
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.190 2003/05/28 17:25:02 tgl Exp $
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.191 2003/05/28 18:19:09 tgl Exp $
#
#-------------------------------------------------------------------------
@ -612,7 +612,7 @@ echo "ok"
# To break an SQL command across lines in this script, backslash-escape all
# internal newlines in the command.
PGSQL_OPT="$PGSQL_OPT -O -c search_path=pg_catalog"
PGSQL_OPT="$PGSQL_OPT -O -c search_path=pg_catalog -c exit_on_error=true"
$ECHO_N "initializing pg_shadow... "$ECHO_C

9
src/include/miscadmin.h
View File

@ -12,7 +12,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: miscadmin.h,v 1.122 2003/05/28 17:25:02 tgl Exp $
* $Id: miscadmin.h,v 1.123 2003/05/28 18:19:09 tgl Exp $
*
* NOTES
* some of the information in this file should be moved to
@ -104,8 +104,6 @@ extern void ProcessInterrupts(void);
/*
* from postmaster/postmaster.c
*/
extern bool IsPostmasterEnvironment;
extern bool IsUnderPostmaster;
extern bool ClientAuthInProgress;
extern const bool ExecBackend;
@ -115,6 +113,11 @@ extern void ClosePostmasterPorts(bool pgstat_too);
/*
* from utils/init/globals.c
*/
extern bool IsPostmasterEnvironment;
extern bool IsUnderPostmaster;
extern bool ExitOnAnyError;
extern bool Noversion;
extern char *DataDir;