Compare commits

...

2 Commits

Author SHA1 Message Date
Joonas Koivunen
84da02a6df fix: not that, but maybe this 2024-08-08 13:24:58 +00:00
Joonas Koivunen
0ba5b4daeb hunt down the cancelled within createimagelayerserror 2024-08-08 13:13:50 +00:00
2 changed files with 4 additions and 2 deletions

View File

@@ -312,7 +312,9 @@ impl Layer {
.get_or_maybe_download(true, Some(ctx))
.await
.map_err(|err| match err {
DownloadError::DownloadCancelled => GetVectoredError::Cancelled,
DownloadError::TimelineShutdown | DownloadError::DownloadCancelled => {
GetVectoredError::Cancelled
}
other => GetVectoredError::Other(anyhow::anyhow!(other)),
})?;

View File

@@ -746,7 +746,7 @@ impl From<CreateImageLayersError> for CompactionError {
CreateImageLayersError::Other(e) => {
CompactionError::Other(e.context("create image layers"))
}
_ => CompactionError::Other(e.into()),
value => CompactionError::Other(value.into()),
}
}
}