diff options
| author | Bruce Momjian <bruce@momjian.us> | 2015-05-16 00:40:18 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2015-05-16 00:40:18 -0400 |
| commit | acd75b2643579a26adfbfaa4918e60121ae2c26f (patch) | |
| tree | 48f7cdcc4bd1e303db88f8a74b95ccd58763ef60 | |
| parent | 321db71239cb45ed2f2d3113ff5745757a64581a (diff) | |
| download | postgresql-acd75b2643579a26adfbfaa4918e60121ae2c26f.tar.gz postgresql-acd75b2643579a26adfbfaa4918e60121ae2c26f.zip | |
pg_upgrade: force timeline 1 in the new cluster
Previously, this prevented promoted standby servers from being upgraded
because of a missing WAL history file. (Timeline 1 doesn't need a
history file, and we don't copy WAL files anyway.)
Report by Christian Echerer(?), Alexey Klyukin
Backpatch through 9.0
| -rw-r--r-- | contrib/pg_upgrade/pg_upgrade.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c index 62764f43d33..fdf3eeffefd 100644 --- a/contrib/pg_upgrade/pg_upgrade.c +++ b/contrib/pg_upgrade/pg_upgrade.c @@ -512,8 +512,8 @@ copy_clog_xlog_xid(void) /* now reset the wal archives in the new cluster */ prep_status("Resetting WAL archives"); - exec_prog(true, SYSTEMQUOTE "\"%s/pg_resetxlog\" -l %u,%u,%u \"%s\" >> \"%s\" 2>&1" SYSTEMQUOTE, - new_cluster.bindir, old_cluster.controldata.chkpnt_tli, + exec_prog(true, SYSTEMQUOTE "\"%s/pg_resetxlog\" -l 1,%u,%u \"%s\" >> \"%s\" 2>&1" SYSTEMQUOTE, + new_cluster.bindir, old_cluster.controldata.logid, old_cluster.controldata.nxtlogseg, new_cluster.pgdata, #ifndef WIN32 |