mirrors/pict-rs
1
0
Fork 0
mirror of https://git.asonix.dog/asonix/pict-rs.git synced 2024-11-28 12:31:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Differentiate missing files in old vs new store for migration

Browse source
This commit is contained in:
asonix 2023-07-07 11:03:10 -05:00
parent 55777c7b58
commit 75be876d3c
1 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/lib.rs
View file

@ -1672,13 +1672,21 @@ where
loop {
match do_migrate_file(from, to, identifier).await {
Ok(identifier) => return Ok(identifier),
Err(e) if e.is_not_found() && skip_missing_files => return Err(e),
Err(e) => {
Err(MigrateError::From(e)) if e.is_not_found() && skip_missing_files => return Err(e),
Err(migrate_error) => {
failure_count += 1;
if failure_count > 10 {
tracing::error!("Error migrating file, not retrying");
return Err(e);
match migrate_error {
MigrateError::From(e) => {
tracing::error!("Error migrating file FROM old store, not retrying");
return Err(e);
}
MigrateError::To(e) => {
tracing::error!("Error migrating file TO new store, not retrying");
return Err(e);
}
}
} else {
tracing::warn!("Failed moving file. Retrying +{failure_count}");
}
@ -1689,18 +1697,27 @@ where
}
}
#[derive(Debug)]
enum MigrateError {
From(crate::store::StoreError),
To(crate::store::StoreError),
}
async fn do_migrate_file<S1, S2>(
from: &S1,
to: &S2,
identifier: &S1::Identifier,
) -> Result<S2::Identifier, crate::store::StoreError>
) -> Result<S2::Identifier, MigrateError>
where
S1: Store,
S2: Store,
{
let stream = from.to_stream(identifier, None, None).await?;
let stream = from
.to_stream(identifier, None, None)
.await
.map_err(MigrateError::From)?;
let new_identifier = to.save_stream(stream).await?;
let new_identifier = to.save_stream(stream).await.map_err(MigrateError::To)?;
Ok(new_identifier)
}