diff --git a/pageserver/src/page_image_cache.rs b/pageserver/src/page_image_cache.rs index fe5642e2a9..30fea48d02 100644 --- a/pageserver/src/page_image_cache.rs +++ b/pageserver/src/page_image_cache.rs @@ -25,7 +25,7 @@ const TEST_PAGE_CACHE_SIZE: usize = 50; enum PageImageState { Vacant, // entry is not used - Loaded(Bytes), // page is loaded + Loaded(Bytes), // page is loaded Loading(Option>), // page in process of loading, Condvar is created on demand when some thread need to wait load completion } @@ -189,12 +189,7 @@ pub fn remove(key: Key, tenant_id: TenantId, timeline_id: TimelineId) { } // Find or load page image in the cache -pub fn lookup( - timeline: &Timeline, - rel: RelTag, - blkno: BlockNumber, - lsn: Lsn, -) -> Result { +pub fn lookup(timeline: &Timeline, rel: RelTag, blkno: BlockNumber, lsn: Lsn) -> Result { let key = MaterializedPageHashKey { key: rel_block_to_key(rel, blkno), tenant_id: timeline.tenant_id, diff --git a/pageserver/src/page_service.rs b/pageserver/src/page_service.rs index d50e992ecc..640531d017 100644 --- a/pageserver/src/page_service.rs +++ b/pageserver/src/page_service.rs @@ -584,10 +584,10 @@ impl PageServerHandler { let _profiling_guard = profpoint_start(self.conf, ProfilingConfig::PageRequests); let page = if req.latest { - page_image_cache::lookup(timeline, req.rel, req.blkno, lsn)? + page_image_cache::lookup(timeline, req.rel, req.blkno, lsn) } else { - Arc::new(timeline.get_rel_page_at_lsn(req.rel, req.blkno, lsn, false)?) - }; + timeline.get_rel_page_at_lsn(req.rel, req.blkno, lsn, false) + }?; Ok(PagestreamBeMessage::GetPage(PagestreamGetPageResponse { page, }))