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

Commitb916cc4

Browse files
committed
Cause standalone backend (including bootstrap case) to read the GUC
config file if it exists. This was already discussed as being a goodidea, and now seems the cleanest way to deal with initdb-time failureson machines with small SHMMAX. (The submitted patches instead modifiedinitdb.sh to pass the correct sizing parameters, but that would stillleave standalone backends prone to failure later. An admin who needsto use a standalone backend has enough trouble already, he shouldn'thave to manually configure its shmem settings...)
1 parentd70610c commitb916cc4

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

‎src/backend/bootstrap/bootstrap.c

Lines changed: 8 additions & 2 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-
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.165 2003/08/04 02:39:57 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.166 2003/09/02 19:04:12 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -368,9 +368,15 @@ BootstrapMain(int argc, char *argv[])
368368
Assert(DataDir);
369369
ValidatePgVersion(DataDir);
370370

371+
/* Acquire configuration parameters */
372+
if (IsUnderPostmaster)
373+
{
371374
#ifdefEXEC_BACKEND
372-
read_nondefault_variables();
375+
read_nondefault_variables();
373376
#endif
377+
}
378+
else
379+
ProcessConfigFile(PGC_POSTMASTER);
374380

375381
if (IsUnderPostmaster)
376382
{

‎src/backend/tcop/postgres.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.361 2003/08/26 15:38:24 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.362 2003/09/02 19:04:12 tgl Exp $
1212
*
1313
* NOTES
1414
* this is the "main" module of the postgres backend and
@@ -2490,9 +2490,15 @@ PostgresMain(int argc, char *argv[], const char *username)
24902490
}
24912491
Assert(DataDir);
24922492

2493+
/* Acquire configuration parameters */
2494+
if (IsUnderPostmaster)
2495+
{
24932496
#ifdefEXEC_BACKEND
2494-
read_nondefault_variables();
2497+
read_nondefault_variables();
24952498
#endif
2499+
}
2500+
else
2501+
ProcessConfigFile(PGC_POSTMASTER);
24962502

24972503
/*
24982504
* Set up signal handlers and masks.
@@ -2651,7 +2657,7 @@ PostgresMain(int argc, char *argv[], const char *username)
26512657
if (!IsUnderPostmaster)
26522658
{
26532659
puts("\nPOSTGRES backend interactive interface ");
2654-
puts("$Revision: 1.361 $ $Date: 2003/08/26 15:38:24 $\n");
2660+
puts("$Revision: 1.362 $ $Date: 2003/09/02 19:04:12 $\n");
26552661
}
26562662

26572663
/*

0 commit comments

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