From d8e874dbdd33294543d34fdcd7ed1d97c6f71c29 Mon Sep 17 00:00:00 2001
From: John Spray <john@neon.tech>
Date: Tue, 17 Oct 2023 16:58:42 +0100
Subject: [PATCH] pageserver: tolerate loading empty tenants from remote
 storage

---
 pageserver/src/tenant.rs                                 | 4 ----
 pageserver/src/tenant/remote_timeline_client/download.rs | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/pageserver/src/tenant.rs b/pageserver/src/tenant.rs
index 39464f4b3e..bb5a4525b6 100644
--- a/pageserver/src/tenant.rs
+++ b/pageserver/src/tenant.rs
@@ -794,10 +794,6 @@ impl Tenant {
             }
         }
 
-        if timeline_ancestors.is_empty() {
-            anyhow::bail!("no valid timelines found on the remote storage")
-        }
-
         // For every timeline, download the metadata file, scan the local directory,
         // and build a layer map that contains an entry for each remote and local
         // layer file.
diff --git a/pageserver/src/tenant/remote_timeline_client/download.rs b/pageserver/src/tenant/remote_timeline_client/download.rs
index ef8d217be4..cb52c0bf84 100644
--- a/pageserver/src/tenant/remote_timeline_client/download.rs
+++ b/pageserver/src/tenant/remote_timeline_client/download.rs
@@ -183,10 +183,6 @@ pub async fn list_remote_timelines(
     )
     .await?;
 
-    if timelines.is_empty() {
-        anyhow::bail!("no timelines found on the remote storage")
-    }
-
     let mut timeline_ids = HashSet::new();
 
     for timeline_remote_storage_key in timelines {