From 594041311c8263832258d35632aa3eebf9371fd1 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Mon, 8 Apr 2013 16:26:52 +0300 Subject: [PATCH] Fix calculation of how many segments to retain for wal_keep_segments. KeepLogSeg function was broken when we switched to use a 64-bit int for the segment number. Per report from Jeff Janes. --- src/backend/access/transam/xlog.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 25b2ff9d03b..3cb866f5306 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -7523,9 +7523,9 @@ CreateRestartPoint(int flags) } /* - * Calculate the last segment that we need to retain because of - * wal_keep_segments, by subtracting wal_keep_segments from - * the given xlog location, recptr. + * Retreat *logSegNo to the last segment that we need to retain because of + * wal_keep_segments. This is calculated by subtracting wal_keep_segments + * from the given xlog location, recptr. */ static void KeepLogSeg(XLogRecPtr recptr, XLogSegNo *logSegNo) @@ -7541,7 +7541,7 @@ KeepLogSeg(XLogRecPtr recptr, XLogSegNo *logSegNo) if (segno <= wal_keep_segments) segno = 1; else - segno = *logSegNo - wal_keep_segments; + segno = segno - wal_keep_segments; /* don't delete WAL segments newer than the calculated segment */ if (segno < *logSegNo)