From df161c94e7e0db33557fb4f19b111729b7dc4fb9 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c index c4f71ba5c19..452cde45c2e 100644 --- a/contrib/pg_upgrade/pg_upgrade.c +++ b/contrib/pg_upgrade/pg_upgrade.c @@ -470,8 +470,8 @@ copy_clog_xlog_xid(migratorContext *ctx) /* now reset the wal archives in the new cluster */ prep_status(ctx, "Resetting WAL archives"); - exec_prog(ctx, true, SYSTEMQUOTE "\"%s/pg_resetxlog\" -l %u,%u,%u \"%s\" >> \"%s\" 2>&1" SYSTEMQUOTE, - ctx->new.bindir, ctx->old.controldata.chkpnt_tli, + exec_prog(ctx, true, SYSTEMQUOTE "\"%s/pg_resetxlog\" -l 1,%u,%u \"%s\" >> \"%s\" 2>&1" SYSTEMQUOTE, + ctx->new.bindir, ctx->old.controldata.logid, ctx->old.controldata.nxtlogseg, ctx->new.pgdata, #ifndef WIN32 -- 2.39.5