From 9eb503557218c0d610282456d06c333c65f9e825 Mon Sep 17 00:00:00 2001 From: Cuong Nguyen Date: Tue, 31 Oct 2023 16:56:00 -0400 Subject: [PATCH] Revert get latest lsn change --- pageserver/src/page_service.rs | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pageserver/src/page_service.rs b/pageserver/src/page_service.rs index 1dddd65c6fe2..3b860fc3bcf4 100644 --- a/pageserver/src/page_service.rs +++ b/pageserver/src/page_service.rs @@ -956,21 +956,8 @@ impl PageServerHandler { ctx: &RequestContext, ) -> anyhow::Result { let latest_gc_cutoff_lsn = timeline.get_latest_gc_cutoff_lsn(); - let lsn = { - let last_received_lsn = timeline - .last_received_wal - .read() - .unwrap() - .as_ref() - .map(|wal| wal.last_received_msg_lsn); - if let Some(lsn) = last_received_lsn { - lsn - } else { - // No WAL has been received yet. Fall back to getting the latest processed lsn - Self::wait_or_get_last_lsn(timeline, Lsn(0), true, &latest_gc_cutoff_lsn, ctx) - .await? - } - }; + let lsn = + Self::wait_or_get_last_lsn(timeline, Lsn(0), true, &latest_gc_cutoff_lsn, ctx).await?; Ok(PagestreamBeMessage::GetLatestLsn( PagestreamGetLatestLsnResponse { lsn },