From 8a0a0d06a8f96409e31e3bb7c911511e4cb3226a Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Mon, 13 Jan 2025 14:35:14 +0100 Subject: [PATCH] renames --- pageserver/src/tenant/timeline/handle.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pageserver/src/tenant/timeline/handle.rs b/pageserver/src/tenant/timeline/handle.rs index e3c40b5f35..68ba5929e5 100644 --- a/pageserver/src/tenant/timeline/handle.rs +++ b/pageserver/src/tenant/timeline/handle.rs @@ -417,15 +417,15 @@ impl Cache { impl Handle { pub(crate) async fn upgrade(&mut self) -> Option> { // This could probably simplified with a - let guard = self.0.lock_owned().await; - let map_res = OwnedMutexGuard::try_map(guard, |f: &mut HandleInner| match f { + let lock_guard = self.0.lock_owned().await; + let res = OwnedMutexGuard::try_map(lock_guard, |f: &mut HandleInner| match f { HandleInner::KeepingTimelineGateOpen { timeline, .. } => Some(&mut timeline), HandleInner::ShutDown => None, }); - let Ok(timeline) = map_res else { + let Ok(mapped_lock_guard) = res else { return None; }; - Some(timeline) + Some(mapped_lock_guard) } }