From 56565c0f584d111416fe579fd056ed9bdff58662 Mon Sep 17 00:00:00 2001 From: Stas Kelvich Date: Tue, 3 Aug 2021 21:25:37 +0300 Subject: [PATCH] look up WAL in right directory --- walkeeper/src/receive_wal.rs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/walkeeper/src/receive_wal.rs b/walkeeper/src/receive_wal.rs index f12b6263f5..a411171d7f 100644 --- a/walkeeper/src/receive_wal.rs +++ b/walkeeper/src/receive_wal.rs @@ -242,10 +242,21 @@ impl ReceiveWalConn { my_info.server.node_id = node_id; /* Calculate WAL end based on local data */ - let (flush_lsn, timeline) = self.timeline.find_end_of_wal(&self.conf.data_dir, true); + let (flush_lsn, timeline) = self.timeline.find_end_of_wal( + &self + .conf + .data_dir + .join(format!("{}", server_info.timeline_id)), + true, + ); my_info.flush_lsn = flush_lsn; my_info.server.timeline = timeline; + info!( + "find_end_of_wal in {:?}: timeline={} flush_lsn={}", + &self.conf.data_dir, timeline, flush_lsn + ); + /* Report my identifier to proposer */ my_info.ser_into(&mut self.stream_out)?; @@ -284,8 +295,8 @@ impl ReceiveWalConn { } info!( - "Start streaming from timeline {} tenant {} address {:?}", - server_info.timeline_id, server_info.tenant_id, self.peer_addr, + "Start streaming from timeline {} tenant {} address {:?} flush_lsn={}", + server_info.timeline_id, server_info.tenant_id, self.peer_addr, my_info.flush_lsn ); // Main loop