From cf916b9be890fb8fd9f7c08ed6fa95f8953ffbf3 Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Thu, 25 Jan 2024 18:28:05 +0000 Subject: [PATCH] unnest the match, as per review request --- control_plane/src/pageserver.rs | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/control_plane/src/pageserver.rs b/control_plane/src/pageserver.rs index d3317b9fbd..b6e6b5fdca 100644 --- a/control_plane/src/pageserver.rs +++ b/control_plane/src/pageserver.rs @@ -239,19 +239,9 @@ impl PageServerNode { let res = tokio::time::timeout(Duration::from_secs(1), self.http_client.status()).await; match res { - Ok(res) => match res { - Ok(_) => Ok(true), - Err(e) => match e { - mgmt_api::Error::ReceiveBody(e) => { - if e.is_connect() { - Ok(false) - } else { - anyhow::bail!(e) - } - } - e => anyhow::bail!(e), - }, - }, + Ok(Ok(_)) => Ok(true), + Ok(Err(mgmt_api::Error::ReceiveBody(e))) if e.is_connect() => Ok(false), + Ok(Err(e)) => anyhow::bail!(e), Err(_timeout) => Ok(false), } },