From 4051c5d4ff56a585fa9b1228977f2ed04ee376ae Mon Sep 17 00:00:00 2001 From: Konstantin Knizhnik Date: Fri, 20 Aug 2021 12:31:53 +0300 Subject: [PATCH] Undo some redundant fixes --- pageserver/src/walreceiver.rs | 2 +- walkeeper/src/receive_wal.rs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pageserver/src/walreceiver.rs b/pageserver/src/walreceiver.rs index 9510fc6cd5..069f84e2ff 100644 --- a/pageserver/src/walreceiver.rs +++ b/pageserver/src/walreceiver.rs @@ -207,7 +207,7 @@ fn walreceiver_main( waldecoder.feed_bytes(data); - while let Ok(Some((lsn, recdata))) = waldecoder.poll_decode() { + while let Some((lsn, recdata)) = waldecoder.poll_decode()? { // Save old checkpoint value to compare with it after decoding WAL record let old_checkpoint_bytes = checkpoint.encode(); let decoded = decode_wal_record(recdata.clone()); diff --git a/walkeeper/src/receive_wal.rs b/walkeeper/src/receive_wal.rs index 6943f51e12..0ca2d2252c 100644 --- a/walkeeper/src/receive_wal.rs +++ b/walkeeper/src/receive_wal.rs @@ -303,7 +303,6 @@ impl<'pg> ReceiveWalConn<'pg> { this_timeline.get().set_info(&my_info); /* Need to persist our vote first */ this_timeline.get().save_control_file(true)?; - this_timeline.get().set_info(&my_info); let mut flushed_restart_lsn = Lsn(0); let wal_seg_size = server_info.wal_seg_size as usize;