Deuxfleurs/garage
33
58
Fork 80
Code Issues 101 Pull requests 18 Releases 30 Wiki Activity

db-snapshot: Add error handling to metadata snapshot creation #930

Open
baptiste wants to merge 2 commits from handle_snapshot_errors into main
pull from: handle_snapshot_errors
merge into: Deuxfleurs:main
Conversation 2 Commits 2 Files changed 1 +9 -2
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/garage/admin/mod.rs
View file

@ -482,7 +482,7 @@ impl AdminRpcHandler {
AdminRpc::MetaOperation(MetaOperation::Snapshot { all: false }), AdminRpc::MetaOperation(MetaOperation::Snapshot { all: false }),
PRIO_NORMAL, PRIO_NORMAL,
) )
.await .await?
})) }))
.await; .await;
@ -495,7 +495,14 @@ impl AdminRpcHandler {
ret.push(format!("{:?}\t{}", to, res_str)); ret.push(format!("{:?}\t{}", to, res_str));
} }
Ok(AdminRpc::Ok(format_table_to_string(ret))) if resps.iter().any(|resp| match resp {
lx commented 2025-01-27 18:05:22 +00:00
Review
Copy link

simplify: resps.iter().any(Result::is_err)

simplify: `resps.iter().any(Result::is_err)`
❤️ 1
baptiste commented 2025-01-27 18:11:32 +00:00
Review
Copy link

I tried many different ways to simplify this code but I did not find anything satisfying. Thanks for the very nice solution :)

I tried many different ways to simplify this code but I did not find anything satisfying. Thanks for the very nice solution :)
Err(_) => true,
Ok(_) => false,
}) {
Err(Error::BadRequest(format_table_to_string(ret)).into())
lx commented 2025-01-27 18:05:39 +00:00
Review
Copy link

Error::Message is more appropriate here

`Error::Message` is more appropriate here
} else {
Ok(AdminRpc::Ok(format_table_to_string(ret)))
}
} }
MetaOperation::Snapshot { all: false } => { MetaOperation::Snapshot { all: false } => {
garage_model::snapshot::async_snapshot_metadata(&self.garage).await?; garage_model::snapshot::async_snapshot_metadata(&self.garage).await?;