Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite82d9e6

Browse files
committed
Adjust elog.c so that elog(FATAL) exits (including cases where ERROR is
promoted to FATAL) end in exit(1) not exit(0). Then change the postmaster toallow exit(1) without a system-wide panic, but not for the startup subprocessor the bgwriter. There were a couple of places that were using exit(1) todeliberately force a system-wide panic; adjust these to be exit(2) instead.This fixes the problem noted back in July that if the startup process exitswith elog(ERROR), the postmaster would think everything is hunky-dory andproceed to start up. Alternative solutions such as trying to run the entirestartup process as a critical section seem less clean, primarily because ofthe fact that a fair amount of startup code is shared by all postmasterchildren in the EXEC_BACKEND case. We'd need an ugly special case somewherenear the head of main.c to make it work if it's the child process'sresponsibility to determine what happens; and what's the point when thepostmaster already treats different children differently?
1 parent778bb7b commite82d9e6

File tree

5 files changed

+39
-40
lines changed

5 files changed

+39
-40
lines changed

‎src/backend/bootstrap/bootstrap.c‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.225 2006/10/04 00:29:49 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.226 2006/11/21 00:49:54 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -421,15 +421,8 @@ BootstrapMain(int argc, char *argv[])
421421
caseBS_XLOG_STARTUP:
422422
bootstrap_signals();
423423
StartupXLOG();
424-
425-
/*
426-
* These next two functions don't consider themselves critical,
427-
* but we'd best PANIC anyway if they fail.
428-
*/
429-
START_CRIT_SECTION();
430424
LoadFreeSpaceMap();
431425
BuildFlatFiles(false);
432-
END_CRIT_SECTION();
433426
proc_exit(0);/* startup done */
434427

435428
caseBS_XLOG_BGWRITER:

‎src/backend/postmaster/bgwriter.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*
3838
*
3939
* IDENTIFICATION
40-
* $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.29 2006/10/06 17:13:59 petere Exp $
40+
* $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.30 2006/11/21 00:49:55 tgl Exp $
4141
*
4242
*-------------------------------------------------------------------------
4343
*/
@@ -503,12 +503,12 @@ bg_quickdie(SIGNAL_ARGS)
503503
* corrupted, so we don't want to try to clean up our transaction. Just
504504
* nail the windows shut and get out of town.
505505
*
506-
* Note we do exit(1) not exit(0).This is to force the postmaster into a
506+
* Note we do exit(2) not exit(0).This is to force the postmaster into a
507507
* system reset cycle if some idiot DBA sends a manual SIGQUIT to a random
508508
* backend. This is necessary precisely because we don't clean up our
509509
* shared memory state.
510510
*/
511-
exit(1);
511+
exit(2);
512512
}
513513

514514
/* SIGHUP: set flag to re-read config file at next convenient time */

‎src/backend/postmaster/postmaster.c‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*
3838
*
3939
* IDENTIFICATION
40-
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.501 2006/11/05 22:42:09 tgl Exp $
40+
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.502 2006/11/21 00:49:55 tgl Exp $
4141
*
4242
* NOTES
4343
*
@@ -358,6 +358,10 @@ static void ShmemBackendArrayRemove(pid_t pid);
358358
#defineStartupDataBase()StartChildProcess(BS_XLOG_STARTUP)
359359
#defineStartBackgroundWriter() StartChildProcess(BS_XLOG_BGWRITER)
360360

361+
/* Macros to check exit status of a child process */
362+
#defineEXIT_STATUS_0(st) ((st) == 0)
363+
#defineEXIT_STATUS_1(st) (WIFEXITED(st) && WEXITSTATUS(st) == 1)
364+
361365

362366
/*
363367
* Postmaster main entry point
@@ -2025,7 +2029,8 @@ reaper(SIGNAL_ARGS)
20252029
if (StartupPID!=0&&pid==StartupPID)
20262030
{
20272031
StartupPID=0;
2028-
if (exitstatus!=0)
2032+
/* Note: FATAL exit of startup is treated as catastrophic */
2033+
if (!EXIT_STATUS_0(exitstatus))
20292034
{
20302035
LogChildExit(LOG,_("startup process"),
20312036
pid,exitstatus);
@@ -2078,7 +2083,8 @@ reaper(SIGNAL_ARGS)
20782083
if (BgWriterPID!=0&&pid==BgWriterPID)
20792084
{
20802085
BgWriterPID=0;
2081-
if (exitstatus==0&&Shutdown>NoShutdown&& !FatalError&&
2086+
if (EXIT_STATUS_0(exitstatus)&&
2087+
Shutdown>NoShutdown&& !FatalError&&
20822088
!DLGetHead(BackendList)&&AutoVacPID==0)
20832089
{
20842090
/*
@@ -2096,23 +2102,25 @@ reaper(SIGNAL_ARGS)
20962102
}
20972103

20982104
/*
2099-
* Any unexpected exit of the bgwriter is treated as a crash.
2105+
* Any unexpected exit of the bgwriter (including FATAL exit)
2106+
* is treated as a crash.
21002107
*/
21012108
HandleChildCrash(pid,exitstatus,
21022109
_("background writer process"));
21032110
continue;
21042111
}
21052112

21062113
/*
2107-
* Was it the autovacuum process? Normal exit can be ignored; we'll
2108-
* start a new one at the next iteration of the postmaster's main
2109-
* loop, if necessary. An unexpected exit is treated as a crash.
2114+
* Was it the autovacuum process? Normal or FATAL exit can be
2115+
* ignored; we'll start a new one at the next iteration of the
2116+
* postmaster's main loop, if necessary. Any other exit condition
2117+
* is treated as a crash.
21102118
*/
21112119
if (AutoVacPID!=0&&pid==AutoVacPID)
21122120
{
21132121
AutoVacPID=0;
21142122
autovac_stopped();
2115-
if (exitstatus!=0)
2123+
if (!EXIT_STATUS_0(exitstatus)&& !EXIT_STATUS_1(exitstatus))
21162124
HandleChildCrash(pid,exitstatus,
21172125
_("autovacuum process"));
21182126
continue;
@@ -2126,7 +2134,7 @@ reaper(SIGNAL_ARGS)
21262134
if (PgArchPID!=0&&pid==PgArchPID)
21272135
{
21282136
PgArchPID=0;
2129-
if (exitstatus!=0)
2137+
if (!EXIT_STATUS_0(exitstatus))
21302138
LogChildExit(LOG,_("archiver process"),
21312139
pid,exitstatus);
21322140
if (XLogArchivingActive()&&
@@ -2143,7 +2151,7 @@ reaper(SIGNAL_ARGS)
21432151
if (PgStatPID!=0&&pid==PgStatPID)
21442152
{
21452153
PgStatPID=0;
2146-
if (exitstatus!=0)
2154+
if (!EXIT_STATUS_0(exitstatus))
21472155
LogChildExit(LOG,_("statistics collector process"),
21482156
pid,exitstatus);
21492157
if (StartupPID==0&& !FatalError&&Shutdown==NoShutdown)
@@ -2157,7 +2165,7 @@ reaper(SIGNAL_ARGS)
21572165
SysLoggerPID=0;
21582166
/* for safety's sake, launch new logger *first* */
21592167
SysLoggerPID=SysLogger_Start();
2160-
if (exitstatus!=0)
2168+
if (!EXIT_STATUS_0(exitstatus))
21612169
LogChildExit(LOG,_("system logger process"),
21622170
pid,exitstatus);
21632171
continue;
@@ -2229,12 +2237,12 @@ CleanupBackend(int pid,
22292237
LogChildExit(DEBUG2,_("server process"),pid,exitstatus);
22302238

22312239
/*
2232-
* If a backend dies in an ugly way(i.e. exit status not 0) then we must
2233-
*signal all other backendsto quickdie. If exit status is zero we
2234-
* assume everything ishunky dory and simply remove the backend from the
2240+
* If a backend dies in an ugly waythen we must signal all other backends
2241+
* to quickdie. If exit status is zero (normal) or one (FATAL exit), we
2242+
* assume everything isall right and simply remove the backend from the
22352243
* active backend list.
22362244
*/
2237-
if (exitstatus!=0)
2245+
if (!EXIT_STATUS_0(exitstatus)&& !EXIT_STATUS_1(exitstatus))
22382246
{
22392247
HandleChildCrash(pid,exitstatus,_("server process"));
22402248
return;

‎src/backend/tcop/postgres.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.516 2006/10/19 19:52:22 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.517 2006/11/21 00:49:55 tgl Exp $
1212
*
1313
* NOTES
1414
* this is the "main" module of the postgres backend and
@@ -2327,12 +2327,12 @@ quickdie(SIGNAL_ARGS)
23272327
* corrupted, so we don't want to try to clean up our transaction. Just
23282328
* nail the windows shut and get out of town.
23292329
*
2330-
* Note we do exit(1) not exit(0).This is to force the postmaster into a
2330+
* Note we do exit(2) not exit(0).This is to force the postmaster into a
23312331
* system reset cycle if some idiot DBA sends a manual SIGQUIT to a random
23322332
* backend. This is necessary precisely because we don't clean up our
23332333
* shared memory state.
23342334
*/
2335-
exit(1);
2335+
exit(2);
23362336
}
23372337

23382338
/*
@@ -2374,7 +2374,7 @@ die(SIGNAL_ARGS)
23742374

23752375
/*
23762376
* Timeout or shutdown signal from postmaster during client authentication.
2377-
* Simply exit(0).
2377+
* Simply exit(1).
23782378
*
23792379
* XXX: possible future improvement: try to send a message indicating
23802380
* why we are disconnecting. Problem is to be sure we don't block while
@@ -2383,7 +2383,7 @@ die(SIGNAL_ARGS)
23832383
void
23842384
authdie(SIGNAL_ARGS)
23852385
{
2386-
exit(0);
2386+
exit(1);
23872387
}
23882388

23892389
/*

‎src/backend/utils/error/elog.c‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
*
4343
*
4444
* IDENTIFICATION
45-
* $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.175 2006/10/01 22:08:18 tgl Exp $
45+
* $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.176 2006/11/21 00:49:55 tgl Exp $
4646
*
4747
*-------------------------------------------------------------------------
4848
*/
@@ -421,25 +421,23 @@ errfinish(int dummy,...)
421421
* fflush here is just to improve the odds that we get to see the
422422
* error message, in case things are so hosed that proc_exit crashes.
423423
* Any other code you might be tempted to add here should probably be
424-
* in an on_proc_exit callback instead.
424+
* in an on_proc_exitor on_shmem_exitcallback instead.
425425
*/
426426
fflush(stdout);
427427
fflush(stderr);
428428

429429
/*
430-
* If proc_exit is already running, we exit with nonzero exit code to
431-
* indicate that something's pretty wrong. We also want to exit with
432-
* nonzero exit code if not running under the postmaster (for example,
433-
* if we are being run from the initdb script, we'd better return an
434-
* error status).
430+
* Do normal process-exit cleanup, then return exit code 1 to indicate
431+
* FATAL termination. The postmaster may or may not consider this
432+
* worthy of panic, depending on which subprocess returns it.
435433
*/
436-
proc_exit(proc_exit_inprogress|| !IsUnderPostmaster);
434+
proc_exit(1);
437435
}
438436

439437
if (elevel >=PANIC)
440438
{
441439
/*
442-
* Serious crash time. Postmaster will observenonzero process exit
440+
* Serious crash time. Postmaster will observeSIGABRT process exit
443441
* status and kill the other backends too.
444442
*
445443
* XXX: what if we are *in* the postmaster? abort() won't kill our

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp