diff --git a/pageserver/src/page_service.rs b/pageserver/src/page_service.rs index fcca4602ee..a4756e34f5 100644 --- a/pageserver/src/page_service.rs +++ b/pageserver/src/page_service.rs @@ -848,7 +848,11 @@ impl PageServerHandler { ctx: &RequestContext, ) -> Result { let last_record_lsn = timeline.get_last_record_lsn(); - let request_horizon = if horizon == Lsn::INVALID { lsn } else { horizon }; + let request_horizon = if horizon == Lsn::INVALID { + lsn + } else { + horizon + }; let effective_lsn = Lsn::max(lsn, Lsn::min(request_horizon, last_record_lsn)); if effective_lsn > last_record_lsn { timeline.wait_lsn(effective_lsn, ctx).await?; diff --git a/pageserver/src/walingest.rs b/pageserver/src/walingest.rs index f6641dbdb5..9bc4285a9f 100644 --- a/pageserver/src/walingest.rs +++ b/pageserver/src/walingest.rs @@ -1888,7 +1888,13 @@ mod tests { for blk in 2..1500 { assert_eq!( tline - .get_rel_page_at_lsn(TESTREL_A, blk, Version::Lsn(Lsn(0x80)), Lsn::INVALID, &ctx) + .get_rel_page_at_lsn( + TESTREL_A, + blk, + Version::Lsn(Lsn(0x80)), + Lsn::INVALID, + &ctx + ) .await?, ZERO_PAGE ); @@ -2053,7 +2059,13 @@ mod tests { let data = format!("foo blk {} at {}", blkno, lsn); assert_eq!( tline - .get_rel_page_at_lsn(TESTREL_A, blkno, Version::Lsn(Lsn(0x60)), Lsn::INVALID, &ctx) + .get_rel_page_at_lsn( + TESTREL_A, + blkno, + Version::Lsn(Lsn(0x60)), + Lsn::INVALID, + &ctx + ) .await?, TEST_IMG(&data) ); @@ -2071,7 +2083,13 @@ mod tests { let data = format!("foo blk {} at {}", blkno, lsn); assert_eq!( tline - .get_rel_page_at_lsn(TESTREL_A, blkno, Version::Lsn(Lsn(0x50)), Lsn::INVALID, &ctx) + .get_rel_page_at_lsn( + TESTREL_A, + blkno, + Version::Lsn(Lsn(0x50)), + Lsn::INVALID, + &ctx + ) .await?, TEST_IMG(&data) ); @@ -2107,7 +2125,13 @@ mod tests { let data = format!("foo blk {} at {}", blkno, lsn); assert_eq!( tline - .get_rel_page_at_lsn(TESTREL_A, blkno, Version::Lsn(Lsn(0x80)), Lsn::INVALID, &ctx) + .get_rel_page_at_lsn( + TESTREL_A, + blkno, + Version::Lsn(Lsn(0x80)), + Lsn::INVALID, + &ctx + ) .await?, TEST_IMG(&data) );