From 86056abd0e071b86c447a6523226b37160dd5387 Mon Sep 17 00:00:00 2001
From: Konstantin Knizhnik <knizhnik@garret.ru>
Date: Thu, 20 May 2021 15:26:39 +0300
Subject: [PATCH] Fix merge conflict: set initial WAL position to second
 segment because of pg_resetwal

---
 walkeeper/src/timeline.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/walkeeper/src/timeline.rs b/walkeeper/src/timeline.rs
index 70cf0d5bf0..f110a1e293 100644
--- a/walkeeper/src/timeline.rs
+++ b/walkeeper/src/timeline.rs
@@ -233,7 +233,9 @@ impl TimelineTools for Option<Arc<Timeline>> {
     fn find_end_of_wal(&self, data_dir: &Path, precise: bool) -> (Lsn, TimeLineID) {
         let seg_size = self.get().get_info().server.wal_seg_size as usize;
         let (lsn, timeline) = find_end_of_wal(data_dir, seg_size, precise);
-        (Lsn(lsn), timeline)
+        let wal_start = Lsn((seg_size * 2) as u64); // FIXME: handle pg_resetwal
+        let lsn = Lsn::max(Lsn(lsn), wal_start);
+        (lsn, timeline)
     }
 }