From f291ab2b87b15e3936e021bd25cdab6b523c9da2 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zenith.tech>
Date: Mon, 25 Oct 2021 18:30:56 +0300
Subject: [PATCH] Do not panic on missing tenant

---
 pageserver/src/tenant_mgr.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pageserver/src/tenant_mgr.rs b/pageserver/src/tenant_mgr.rs
index fbf4362c6b..ccd75d6fcd 100644
--- a/pageserver/src/tenant_mgr.rs
+++ b/pageserver/src/tenant_mgr.rs
@@ -222,9 +222,9 @@ pub fn get_repository_for_tenant(tenantid: ZTenantId) -> Result<Arc<dyn Reposito
     let m = access_tenants();
     let tenant = m
         .get(&tenantid)
-        .ok_or_else(|| anyhow!("Tenant not found for tenant {}", tenantid));
+        .ok_or_else(|| anyhow!("Tenant not found for tenant {}", tenantid))?;
 
-    match &tenant.unwrap().repo {
+    match &tenant.repo {
         Some(repo) => Ok(Arc::clone(repo)),
         None => anyhow::bail!("Repository for tenant {} is not yet valid", tenantid),
     }