From aafe79873caddf4a745d7e6327039bc8f96353a6 Mon Sep 17 00:00:00 2001 From: John Spray Date: Fri, 12 Jan 2024 12:43:14 +0000 Subject: [PATCH] page_service: handle GetActiveTenantError::Cancelled (#6344) ## Problem Occasional test failures with QueryError::Other errors saying "cancelled" that get logged at error severity. ## Summary of changes Avoid casting GetActiveTenantError::Cancelled into QueryError::Other -- it should be QueryError::Shutdown, which is not logged as an error. --- pageserver/src/page_service.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pageserver/src/page_service.rs b/pageserver/src/page_service.rs index 291490d016..9b4b333a92 100644 --- a/pageserver/src/page_service.rs +++ b/pageserver/src/page_service.rs @@ -1500,7 +1500,8 @@ impl From for QueryError { GetActiveTenantError::WaitForActiveTimeout { .. } => QueryError::Disconnected( ConnectionError::Io(io::Error::new(io::ErrorKind::TimedOut, e.to_string())), ), - GetActiveTenantError::WillNotBecomeActive(TenantState::Stopping { .. }) => { + GetActiveTenantError::Cancelled + | GetActiveTenantError::WillNotBecomeActive(TenantState::Stopping { .. }) => { QueryError::Shutdown } e => QueryError::Other(anyhow::anyhow!(e)),