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

global vectored get error class

Browse Source
This commit is contained in:
Christian Schwarz
2024-09-12 16:39:13 +01:00
parent fcab61bdcd
commit 7bb1fbf424
3 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pageserver/src/http/routes.rs
View File

@@ -183,6 +183,9 @@ impl From<PageReconstructError> for ApiError {
PageReconstructError::Cancelled => ApiError::Cancelled,
PageReconstructError::AncestorLsnTimeout(e) => ApiError::Timeout(format!("{e}").into()),
PageReconstructError::WalRedo(pre) => ApiError::InternalServerError(pre),
PageReconstructError::VectoredGetGlobalError(e) => {
ApiError::InternalServerError(anyhow::anyhow!(e))
}
}
}
}

1
pageserver/src/pgdatadir_mapping.rs
View File

@@ -1814,6 +1814,7 @@ impl<'a> DatadirModification<'a> {
n_files = dir.files.len();
aux_files.dir = Some(dir);
}
Err(PageReconstructError::VectoredGetGlobalError(_)) => todo!(),
Err(
e @ (PageReconstructError::Cancelled
| PageReconstructError::AncestorLsnTimeout(_)),

25
pageserver/src/tenant/timeline.rs
View File

@@ -526,6 +526,9 @@ pub(crate) enum PageReconstructError {
#[error("{0}")]
MissingKey(MissingKeyError),
#[error("vectored get error: {0}")]
VectoredGetGlobalError(VectoredGetGlobalError),
}
impl From<anyhow::Error> for PageReconstructError {
@@ -604,7 +607,11 @@ impl PageReconstructError {
use PageReconstructError::*;
match self {
Cancelled => true,
Other(_) | AncestorLsnTimeout(_) | WalRedo(_) | MissingKey(_) => false,
Other(_)
| AncestorLsnTimeout(_)
| WalRedo(_)
| MissingKey(_)
| VectoredGetGlobalError(_) => false,
}
}
}
@@ -818,6 +825,22 @@ impl From<GetVectoredError> for PageReconstructError {
}
}
#[derive(thiserror::Error, Debug)]
#[error("{0}")]
pub(crate) struct VectoredGetGlobalError(&'static str);
impl<'a> From<&'a GetVectoredError> for VectoredGetGlobalError {
fn from(e: &'a GetVectoredError) -> Self {
match e {
GetVectoredError::Oversized(_) => VectoredGetGlobalError("oversized"),
GetVectoredError::InvalidLsn(_) => VectoredGetGlobalError("invalid LSN"),
GetVectoredError::MissingKey(_) => VectoredGetGlobalError("missing key"),
GetVectoredError::GetReadyAncestorError(_) => VectoredGetGlobalError("ancestor LSN"),
GetVectoredError::Cancelled => VectoredGetGlobalError("cancelled"),
GetVectoredError::Other(_) => VectoredGetGlobalError("other"),
}
}
}
impl From<GetReadyAncestorError> for PageReconstructError {
fn from(e: GetReadyAncestorError) -> Self {
use GetReadyAncestorError::*;