diff options
| author | Bruce Momjian <bruce@momjian.us> | 2011-10-07 14:40:23 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2011-10-07 14:40:23 -0400 |
| commit | caa1054df8408b165e5f66ff25c87b6dd0a0a1e7 (patch) | |
| tree | 750e99b5d637d04eca817c6bafdc7103807ab5af /contrib/pg_upgrade/server.c | |
| parent | a3996754cc0281293cc5bfb90bf594fef41aff5b (diff) | |
In pg_upgrade, use the new postmaster -C option to get the real data
directory, for config-only directory installs. Only works for PG 9.2+
servers.
Diffstat (limited to 'contrib/pg_upgrade/server.c')
| -rw-r--r-- | contrib/pg_upgrade/server.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c index 8c4aec99184..d512ef3d4fe 100644 --- a/contrib/pg_upgrade/server.c +++ b/contrib/pg_upgrade/server.c @@ -169,7 +169,7 @@ start_postmaster(ClusterInfo *cluster) snprintf(cmd, sizeof(cmd), SYSTEMQUOTE "\"%s/pg_ctl\" -w -l \"%s\" -D \"%s\" " "-o \"-p %d %s\" start >> \"%s\" 2>&1" SYSTEMQUOTE, - cluster->bindir, log_opts.filename2, cluster->pgdata, cluster->port, + cluster->bindir, log_opts.filename2, cluster->pgconfig, cluster->port, (cluster->controldata.cat_ver >= BINARY_UPGRADE_SERVER_FLAG_CAT_VER) ? "-b" : "-c autovacuum=off -c autovacuum_freeze_max_age=2000000000", @@ -208,17 +208,17 @@ stop_postmaster(bool fast) { char cmd[MAXPGPATH]; const char *bindir; - const char *datadir; + const char *configdir; if (os_info.running_cluster == &old_cluster) { bindir = old_cluster.bindir; - datadir = old_cluster.pgdata; + configdir = old_cluster.pgconfig; } else if (os_info.running_cluster == &new_cluster) { bindir = new_cluster.bindir; - datadir = new_cluster.pgdata; + configdir = new_cluster.pgconfig; } else return; /* no cluster running */ @@ -226,7 +226,7 @@ stop_postmaster(bool fast) snprintf(cmd, sizeof(cmd), SYSTEMQUOTE "\"%s/pg_ctl\" -w -l \"%s\" -D \"%s\" %s stop >> " "\"%s\" 2>&1" SYSTEMQUOTE, - bindir, log_opts.filename2, datadir, fast ? "-m fast" : "", + bindir, log_opts.filename2, configdir, fast ? "-m fast" : "", log_opts.filename2); exec_prog(fast ? false : true, "%s", cmd); |