From 5927a196295eea63424011c15d7359ed8141812c Mon Sep 17 00:00:00 2001 From: Kyotaro Horiguchi Date: Wed, 15 Jun 2016 12:00:33 +0900 Subject: [PATCH] Advancing minRecoveryPoint for executed empty restart point. Currently, restart point with no buffer flush doesn't update the minRecoveryPoint but updates lastCheckPoint. This can cause do_pg_stop_backup() to return the stop LSN smaller than the start LSN given by do_pg_start_backup() and leads to falure in taking base backup. This patch let CreateRestartPoint update the minRecoveryPoint if an executed restartpoint is accompanied with no buffer flush. --- src/backend/access/transam/xlog.c | 9 +++++++++ src/test/recovery/t/001_stream_rep.pl | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index e4645a3..7697223 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -8797,6 +8797,15 @@ CreateRestartPoint(int flags) CheckPointGuts(lastCheckPoint.redo, flags); /* + * basebackup needs minRecoveryPoint to be grater than or equal to the + * redo point of this checkpoint. If no buffer is flushed so far, + * minRecoveryPoint has not advanced during this checkpoint. So explicitly + * advance it to there for the case. + */ + if (CheckpointStats.ckpt_bufs_written == 0) + UpdateMinRecoveryPoint(lastCheckPointRecPtr, false); + + /* * Remember the prior checkpoint's redo pointer, used later to determine * the point at which we can truncate the log. */ diff --git a/src/test/recovery/t/001_stream_rep.pl b/src/test/recovery/t/001_stream_rep.pl index 7b42f21..cee4768 100644 --- a/src/test/recovery/t/001_stream_rep.pl +++ b/src/test/recovery/t/001_stream_rep.pl @@ -24,6 +24,11 @@ $node_standby_1->start; # pg_basebackup works on a standby). $node_standby_1->backup($backup_name); +# Take a second backup of the standby while the master is offline. +$node_master->stop; +$node_standby_1->backup('my_backup_2'); +$node_master->start; + # Create second standby node linking to standby 1 my $node_standby_2 = get_new_node('standby_2'); $node_standby_2->init_from_backup($node_standby_1, $backup_name, -- 1.8.3.1