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 | affc04d1656010cff7b20573c53a4d31dfabaa5f (patch) | |
| tree | 0cf5ef99f32cc19d04d04e4ffc2bf9e82938834a /contrib | |
| parent | 2a55e713431abf688e656144a4babc6ee5563ffb (diff) | |
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
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/pg_upgrade/pg_upgrade.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c index 35a0f4304d1..5560c15fbaa 100644 --- a/contrib/pg_upgrade/pg_upgrade.c +++ b/contrib/pg_upgrade/pg_upgrade.c @@ -520,8 +520,7 @@ copy_clog_xlog_xid(void) /* now reset the wal archives in the new cluster */ prep_status("Resetting WAL archives"); exec_prog(UTILITY_LOG_FILE, NULL, true, - "\"%s/pg_resetxlog\" -l %u,%u,%u \"%s\"", new_cluster.bindir, - old_cluster.controldata.chkpnt_tli, + "\"%s/pg_resetxlog\" -l 1,%u,%u \"%s\"", new_cluster.bindir, old_cluster.controldata.logid, old_cluster.controldata.nxtlogseg, new_cluster.pgdata); |