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

refactor: InnerDeleteTimelineError does not need to be Error

Browse Source
This commit is contained in:
Joonas Koivunen
2023-05-05 00:54:19 +03:00
parent e00da98996
commit a543e7081f
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pageserver/src/tenant.rs
View File

@@ -449,7 +449,7 @@ pub enum DeleteTimelineError {
#[error("Cannot delete timeline which has child timelines")]
HasChildren,
#[cfg(feature = "testing")]
#[cfg_attr(feature = "testing", error("failpoint {0}"))]
#[cfg_attr(feature = "testing", error("failpoint: {0}"))]
Failpoint(&'static str),
#[error("stop upload queue")]
StopUploadQueue,
@@ -461,23 +461,25 @@ pub enum DeleteTimelineError {
InternalFailure,
}
#[derive(Debug, thiserror::Error)]
#[derive(Debug)]
pub enum InnerDeleteTimelineError {
// FIXME: this should be fixed by init order (either empty or from remote)
#[error("stop upload queue: {0:#}")]
StopUploadQueue(#[from] remote_timeline_client::StopError),
StopUploadQueue(remote_timeline_client::StopError),
#[cfg(feature = "testing")]
#[cfg_attr(feature = "testing", error("failpoint {0}"))]
Failpoint(&'static str),
// FIXME: should this really fail the delete, probably not?
// #[error("directory remove failed: {0:#}")]
// TimelineDirectoryRemoveFailed(std::io::Error),
#[error("failed to upload a tombstoned index_part.json")]
UploadFailed,
#[error("grew children while the layer files were deleted")]
ChildAppearedAfterRemoveDir,
}
impl From<remote_timeline_client::StopError> for InnerDeleteTimelineError {
fn from(e: remote_timeline_client::StopError) -> Self {
InnerDeleteTimelineError::StopUploadQueue(e)
}
}
impl InnerDeleteTimelineError {
fn is_permanent(&self) -> bool {
use InnerDeleteTimelineError::*;