Fix recycling of WAL segments after changing recovery target timeline.

After the recovery target timeline is changed, we would still recycle and
preallocate WAL segments on the old target timeline. Those WAL segments
created for the old timeline are a waste of space, although otherwise
harmless.

The problem is that when installing a recycled WAL segment as a future one,
ThisTimeLineID is used to construct the filename. ThisTimeLineID is
initialized in the checkpointer process to the recovery target timeline at
startup, but it was not updated when the startup process chooses a new
target timeline (recovery_target_timeline='latest'). To fix, always update
ThisTimeLineID before recycling WAL segments at a restartpoint.

This still leaves a small window where we might install WAL segments under
wrong timeline ID, if the target timeline is changed just as we're about to
start recycling. Also, when we're not on the target timeline yet, but still
replaying some older timeline, we'll install WAL segments to the newer
timeline anyway and they will still go wasted. We'll just live with the
waste in that situation.

Commit to 9.2 and 9.1. Older versions didn't change recovery target timeline
after startup, and for master, I'll commit a slightly different variant of
this.

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 0694128e1ed79ea2db26271d57bd6eeaf702cbc8..859df783e6b3a4d7609ff925cf5c4b29b62a031d 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -8259,6 +8259,13 @@ CreateRestartPoint(int flags)
                endptr = GetWalRcvWriteRecPtr(NULL);
 
                PrevLogSeg(_logId, _logSeg);
+
+               /*
+                * Update ThisTimeLineID to the recovery target timeline, so that
+                * we install any recycled segments on the correct timeline.
+                */
+               ThisTimeLineID = GetRecoveryTargetTLI();
+
                RemoveOldXlogFiles(_logId, _logSeg, endptr);
 
                /*