From ef1c3d391444958514bd7c517e820bf5bae8fa85 Mon Sep 17 00:00:00 2001
From: Joonas Koivunen <joonas@neon.tech>
Date: Thu, 24 Aug 2023 22:21:21 +0300
Subject: [PATCH] test: use guard_against_eviction from outside

---
 pageserver/src/tenant/storage_layer/layer.rs | 10 ----------
 pageserver/src/tenant/timeline.rs            |  5 +----
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/pageserver/src/tenant/storage_layer/layer.rs b/pageserver/src/tenant/storage_layer/layer.rs
index 8dd7543a0d..9d9dc4e352 100644
--- a/pageserver/src/tenant/storage_layer/layer.rs
+++ b/pageserver/src/tenant/storage_layer/layer.rs
@@ -233,11 +233,6 @@ impl Layer {
     pub(crate) fn local_path(&self) -> &Path {
         &self.0.path
     }
-
-    #[cfg(test)]
-    pub(crate) fn needs_download_blocking(&self) -> Result<Option<NeedsDownload>, std::io::Error> {
-        self.0.needs_download_blocking()
-    }
 }
 
 /// The download-ness ([`DownloadedLayer`]) can be either resident or wanted evicted.
@@ -995,11 +990,6 @@ impl ResidentLayer {
     pub(crate) fn access_stats(&self) -> &LayerAccessStats {
         self.owner.access_stats()
     }
-
-    #[cfg(test)]
-    pub(crate) fn needs_download_blocking(&self) -> Result<Option<NeedsDownload>, std::io::Error> {
-        self.owner.needs_download_blocking()
-    }
 }
 
 impl AsLayerDesc for ResidentLayer {
diff --git a/pageserver/src/tenant/timeline.rs b/pageserver/src/tenant/timeline.rs
index e24fe020e7..4bbbea6dee 100644
--- a/pageserver/src/tenant/timeline.rs
+++ b/pageserver/src/tenant/timeline.rs
@@ -4245,10 +4245,7 @@ mod tests {
 
         let (first, second) = (only_one(first), only_one(second));
 
-        batch[0]
-            .needs_download_blocking()
-            .unwrap()
-            .expect("should now have a reason to download");
+        batch[0].guard_against_eviction(false).await.unwrap_err();
 
         match (first, second) {
             (Ok(()), Ok(())) => {