fixup switch to heavier_once_cell: undo changes related to no need fo…

…r async fns
neondatabase · Apr 4, 2024 · 4e4f246 · 4e4f246
1 parent 806c957
commit 4e4f246
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/pageserver/src/http/routes.rs b/pageserver/src/http/routes.rs
@@ -1028,7 +1028,7 @@ async fn tenant_status(
                 attachment_status: state.attachment_status(),
                 generation: tenant.generation().into(),
             },
-            walredo: tenant.wal_redo_manager_status().await,
+            walredo: tenant.wal_redo_manager_status(),
             timelines: tenant.list_timeline_ids(),
         })
     }

diff --git a/pageserver/src/tenant.rs b/pageserver/src/tenant.rs
@@ -384,9 +384,9 @@ impl WalRedoManager {
         }
     }
 
-    pub(crate) async fn status(&self) -> Option<WalRedoManagerStatus> {
+    pub(crate) fn status(&self) -> Option<WalRedoManagerStatus> {
         match self {
-            WalRedoManager::Prod(m) => m.status().await,
+            WalRedoManager::Prod(m) => m.status(),
             #[cfg(test)]
             WalRedoManager::Test(_) => None,
         }
@@ -1683,12 +1683,8 @@ impl Tenant {
         self.generation
     }
 
-    pub(crate) async fn wal_redo_manager_status(&self) -> Option<WalRedoManagerStatus> {
-        if let Some(mgr) = self.walredo_mgr.as_ref() {
-            mgr.status().await
-        } else {
-            None
-        }
+    pub(crate) fn wal_redo_manager_status(&self) -> Option<WalRedoManagerStatus> {
+        self.walredo_mgr.as_ref().and_then(|mgr| mgr.status())
     }
 
     /// Changes tenant status to active, unless shutdown was already requested.

diff --git a/pageserver/src/walredo.rs b/pageserver/src/walredo.rs
@@ -139,7 +139,7 @@ impl PostgresRedoManager {
         }
     }
 
-    pub(crate) async fn status(&self) -> Option<WalRedoManagerStatus> {
+    pub(crate) fn status(&self) -> Option<WalRedoManagerStatus> {
         Some(WalRedoManagerStatus {
             last_redo_at: {
                 let at = *self.last_redo_at.lock().unwrap();