Merge pull request 'db-snapshot: Add error handling to metadata snapshot creation' (#930) from handle_snapshot_errors into main

Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/930
Reviewed-by: Armael <armael@noreply.localhost>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/garage/admin/mod.rs b/src/garage/admin/mod.rs
index ea414b56..1a4ff853 100644
--- a/src/garage/admin/mod.rs
+++ b/src/garage/admin/mod.rs
@@ -484,7 +484,7 @@ impl AdminRpcHandler {
 							AdminRpc::MetaOperation(MetaOperation::Snapshot { all: false }),
 							PRIO_NORMAL,
 						)
-						.await
+						.await?
 				}))
 				.await;
 
@@ -497,7 +497,11 @@ impl AdminRpcHandler {
 					ret.push(format!("{:?}\t{}", to, res_str));
 				}
 
-				Ok(AdminRpc::Ok(format_table_to_string(ret)))
+				if resps.iter().any(Result::is_err) {
+					Err(GarageError::Message(format_table_to_string(ret)).into())
+				} else {
+					Ok(AdminRpc::Ok(format_table_to_string(ret)))
+				}
 			}
 			MetaOperation::Snapshot { all: false } => {
 				garage_model::snapshot::async_snapshot_metadata(&self.garage).await?;