From affc04d1656010cff7b20573c53a4d31dfabaa5f Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Sat, 16 May 2015 00:40:18 -0400 Subject: [PATCH] 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 --- contrib/pg_upgrade/pg_upgrade.c | 3 +-- 1 file changed, 1 insertion(+), 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);