rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-16 01:42:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

pageserver: fix noisy logging on tenant NotFound

Browse Source
This commit is contained in:
John Spray
2024-01-30 15:18:16 +00:00
parent 1e9a50bca8
commit f55021ee76
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pageserver/src/page_service.rs
View File

@@ -68,6 +68,7 @@ use crate::tenant::debug_assert_current_span_has_tenant_and_timeline_id;
use crate::tenant::mgr;
use crate::tenant::mgr::get_active_tenant_with_timeout;
use crate::tenant::mgr::GetActiveTenantError;
use crate::tenant::mgr::GetTenantError;
use crate::tenant::mgr::ShardSelector;
use crate::tenant::timeline::WaitLsnError;
use crate::tenant::GetTimelineError;
@@ -1675,8 +1676,16 @@ impl From<GetActiveTenantError> for QueryError {
ConnectionError::Io(io::Error::new(io::ErrorKind::TimedOut, e.to_string())),
),
GetActiveTenantError::Cancelled
| GetActiveTenantError::WillNotBecomeActive(TenantState::Stopping { .. }) => {
QueryError::Shutdown
| GetActiveTenantError::WillNotBecomeActive(TenantState::Stopping { .. })
| GetActiveTenantError::NotFound(GetTenantError::MapState(_)) => QueryError::Shutdown,
GetActiveTenantError::NotFound(GetTenantError::NotFound(tenant_id)) => {
QueryError::NotFound(format!("Tenant {tenant_id} not attached").into())
}
GetActiveTenantError::NotFound(
GetTenantError::NotActive(_) | GetTenantError::Broken(_),
) => {
// If the tenant is present but not in a state where it can serve I/O, prompt client to backoff/retry by reconnecting
QueryError::Reconnect
}
e => QueryError::Other(anyhow::anyhow!(e)),
}