database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

In pg_upgrade, avoid one start/stop of the postmaster; use the -w

Browse Source 
(wait) flag for pg_ctl start/stop;  remove the unused "quiet" flag in
the functions for starting/stopping the postmaster.
This commit is contained in:
Bruce Momjian
2011-04-25 20:17:48 -04:00
parent 6dab96abaa
commit 44091442db
4 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/pg_upgrade/server.c
View File

@ -160,13 +160,13 @@ stop_postmaster_atexit(void)
stop_postmaster_on_exit(int exitstatus, void *arg)
#endif
{
stop_postmaster(true, true);
stop_postmaster(true);
}
void
start_postmaster(ClusterInfo *cluster, bool quiet)
start_postmaster(ClusterInfo *cluster)
{
char cmd[MAXPGPATH];
const char *bindir;
@ -205,7 +205,7 @@ start_postmaster(ClusterInfo *cluster, bool quiet)
* not touch them.
*/
snprintf(cmd, sizeof(cmd),
SYSTEMQUOTE "\"%s/pg_ctl\" -l \"%s\" -D \"%s\" "
SYSTEMQUOTE "\"%s/pg_ctl\" -w -l \"%s\" -D \"%s\" "
"-o \"-p %d %s\" start >> \"%s\" 2>&1" SYSTEMQUOTE,
bindir, output_filename, datadir, port,
(cluster->controldata.cat_ver >=
@ -228,7 +228,7 @@ start_postmaster(ClusterInfo *cluster, bool quiet)
void
stop_postmaster(bool fast, bool quiet)
stop_postmaster(bool fast)
{
char cmd[MAXPGPATH];
const char *bindir;
@ -249,7 +249,7 @@ stop_postmaster(bool fast, bool quiet)
/* See comment in start_postmaster() about why win32 output is ignored. */
snprintf(cmd, sizeof(cmd),
SYSTEMQUOTE "\"%s/pg_ctl\" -l \"%s\" -D \"%s\" %s stop >> "
SYSTEMQUOTE "\"%s/pg_ctl\" -w -l \"%s\" -D \"%s\" %s stop >> "
"\"%s\" 2>&1" SYSTEMQUOTE,
bindir,
#ifndef WIN32