database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-03 20:02:46 +03:00
Code Activity

Move the responsibility for calling StartupXLOG into InitPostgres, for

Browse Source 
those process types that go through InitPostgres; in particular, bootstrap
and standalone-backend cases.  This ensures that we have set up a PGPROC
and done some other basic initialization steps (corresponding to the
if (IsUnderPostmaster) block in AuxiliaryProcessMain) before we attempt to
run WAL recovery in a standalone backend.  As was discovered last September,
this is necessary for some corner-case code paths during WAL recovery,
particularly end-of-WAL cleanup.

Moving the bootstrap case here too is not necessary for correctness, but it
seems like a good idea since it reduces the number of distinct code paths.
This commit is contained in:
Tom Lane
2010-04-20 01:38:52 +00:00
parent ee7769bb76
commit c670410e7f
3 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.260 2010/02/26 02:00:35 momjian Exp $
* $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.261 2010/04/20 01:38:52 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -397,14 +397,13 @@ AuxiliaryProcessMain(int argc, char *argv[])
switch (auxType)
{
case CheckerProcess:
bootstrap_signals();
/* don't set signals, they're useless here */
CheckerModeMain();
proc_exit(1); /* should never return */
case BootstrapProcess:
bootstrap_signals();
BootStrapXLOG();
StartupXLOG();
BootstrapModeMain();
proc_exit(1); /* should never return */
@ -438,23 +437,12 @@ AuxiliaryProcessMain(int argc, char *argv[])
/*
* In shared memory checker mode, all we really want to do is create shared
* memory and semaphores (just to prove we can do it with the current GUC
* settings).
* settings). Since, in fact, that was already done by BaseInit(),
* we have nothing more to do here.
*/
static void
CheckerModeMain(void)
{
/*
* We must be getting invoked for bootstrap mode
*/
Assert(!IsUnderPostmaster);
SetProcessingMode(BootstrapProcessing);
/*
* Do backend-like initialization for bootstrap mode
*/
InitProcess();
InitPostgres(NULL, InvalidOid, NULL, NULL);
proc_exit(0);
}
@ -478,6 +466,7 @@ BootstrapModeMain(void)
* Do backend-like initialization for bootstrap mode
*/
InitProcess();
InitPostgres(NULL, InvalidOid, NULL, NULL);
/* Initialize stuff for bootstrap-file processing */
@ -498,10 +487,6 @@ BootstrapModeMain(void)
*/
RelationMapFinishBootstrap();
/* Perform a checkpoint to ensure everything's down to disk */
SetProcessingMode(NormalProcessing);
CreateCheckPoint(CHECKPOINT_IS_SHUTDOWN | CHECKPOINT_IMMEDIATE);
/* Clean up and exit */
cleanup();
proc_exit(0);