From 5f0fd093d782191a426dde3e2f0ce7b7c31a904c Mon Sep 17 00:00:00 2001 From: Arseny Sher Date: Wed, 11 Aug 2021 16:26:35 +0300 Subject: [PATCH] Revert "Walkeeper safe info (#408)" Temporary revert commit 0ee2e16b1755a4ce9254078edeb539b532f1193f as it leads to safekeeper state deserialization failure. Let's sort that out and get it back. --- walkeeper/src/receive_wal.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/walkeeper/src/receive_wal.rs b/walkeeper/src/receive_wal.rs index 174b6a52dc..5a701dba17 100644 --- a/walkeeper/src/receive_wal.rs +++ b/walkeeper/src/receive_wal.rs @@ -247,8 +247,8 @@ impl ReceiveWalConn { my_info.server.timeline = timeline; info!( - "find_end_of_wal in {:?}: timeline={} flush_lsn={}, restart_lsn={}", - &self.conf.data_dir, timeline, flush_lsn, my_info.restart_lsn + "find_end_of_wal in {:?}: timeline={} flush_lsn={}", + &self.conf.data_dir, timeline, flush_lsn ); /* Report my identifier to proposer */ @@ -332,7 +332,6 @@ impl ReceiveWalConn { * maximum (vcl) determined by WAL proposer during handshake. * Switching epoch means that node completes recovery and start writing in the WAL new data. */ - self.timeline.get().set_info(&my_info); if my_info.epoch < prop.epoch && end_pos > max(my_info.flush_lsn, prop.vcl) { info!("Switch to new epoch {}", prop.epoch); my_info.epoch = prop.epoch; /* bump epoch */