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

Commit78ce809

Browse files
committed
Postpone pg_timezone_initialize() until after creation of postmaster.pid,
since it can take a fair amount of time and this can confuse boot scriptsthat expect postmaster.pid to appear quickly. Move initialization of SSLlibrary and preloaded libraries to after that point, too, just for luck.Per reports from Tony Caduto and others.
1 parentc9de6b9 commit78ce809

File tree

4 files changed

+34
-23
lines changed

4 files changed

+34
-23
lines changed

‎src/backend/bootstrap/bootstrap.c

Lines changed: 3 additions & 1 deletion
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.207 2005/10/15 02:49:12 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.208 2005/10/20 20:05:44 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -359,6 +359,8 @@ BootstrapMain(int argc, char *argv[])
359359
{
360360
if (!SelectConfigFiles(userDoption,progname))
361361
proc_exit(1);
362+
/* If timezone is not set, determine what the OS uses */
363+
pg_timezone_initialize();
362364
}
363365

364366
/* Validate we have been given a reasonable-looking DataDir */

‎src/backend/postmaster/postmaster.c

Lines changed: 27 additions & 17 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.470 2005/10/17 16:24:19 tgl Exp $
40+
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.471 2005/10/20 20:05:44 tgl Exp $
4141
*
4242
* NOTES
4343
*
@@ -626,7 +626,8 @@ PostmasterMain(int argc, char *argv[])
626626
}
627627

628628
/*
629-
* Other one-time internal sanity checks can go here.
629+
* Other one-time internal sanity checks can go here, if they are fast.
630+
* (Put any slow processing further down, after postmaster.pid creation.)
630631
*/
631632
if (!CheckDateTokenTables())
632633
{
@@ -660,21 +661,6 @@ PostmasterMain(int argc, char *argv[])
660661
(errmsg_internal("-----------------------------------------")));
661662
}
662663

663-
/*
664-
* Initialize SSL library, if specified.
665-
*/
666-
#ifdefUSE_SSL
667-
if (EnableSSL)
668-
secure_initialize();
669-
#endif
670-
671-
/*
672-
* process any libraries that should be preloaded and optionally
673-
* pre-initialized
674-
*/
675-
if (preload_libraries_string)
676-
process_preload_libraries(preload_libraries_string);
677-
678664
/*
679665
* Fork away from controlling terminal, if -S specified.
680666
*
@@ -695,6 +681,30 @@ PostmasterMain(int argc, char *argv[])
695681
*/
696682
CreateDataDirLockFile(true);
697683

684+
/*
685+
* If timezone is not set, determine what the OS uses. (In theory this
686+
* should be done during GUC initialization, but because it can take as
687+
* much as several seconds, we delay it until after we've created the
688+
* postmaster.pid file. This prevents problems with boot scripts that
689+
* expect the pidfile to appear quickly.)
690+
*/
691+
pg_timezone_initialize();
692+
693+
/*
694+
* Initialize SSL library, if specified.
695+
*/
696+
#ifdefUSE_SSL
697+
if (EnableSSL)
698+
secure_initialize();
699+
#endif
700+
701+
/*
702+
* process any libraries that should be preloaded and optionally
703+
* pre-initialized
704+
*/
705+
if (preload_libraries_string)
706+
process_preload_libraries(preload_libraries_string);
707+
698708
/*
699709
* Remove old temporary files.At this point there can be no other
700710
* Postgres processes running in this directory, so this should be safe.

‎src/backend/tcop/postgres.c

Lines changed: 3 additions & 1 deletion
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.466 2005/10/15 02:49:27 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.467 2005/10/20 20:05:45 tgl Exp $
1212
*
1313
* NOTES
1414
* this is the "main" module of the postgres backend and
@@ -2760,6 +2760,8 @@ PostgresMain(int argc, char *argv[], const char *username)
27602760
{
27612761
if (!SelectConfigFiles(userDoption,argv[0]))
27622762
proc_exit(1);
2763+
/* If timezone is not set, determine what the OS uses */
2764+
pg_timezone_initialize();
27632765
}
27642766

27652767
/*

‎src/backend/utils/misc/guc.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.294 2005/10/16 18:26:00 momjian Exp $
13+
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.295 2005/10/20 20:05:45 tgl Exp $
1414
*
1515
*--------------------------------------------------------------------
1616
*/
@@ -2846,9 +2846,6 @@ SelectConfigFiles(const char *userDoption, const char *progname)
28462846

28472847
free(configdir);
28482848

2849-
/* If timezone is not set, determine what the OS uses */
2850-
pg_timezone_initialize();
2851-
28522849
return true;
28532850
}
28542851

0 commit comments

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