Compare commits

..

No commits in common. "handle_snapshot_errors" and "main" have entirely different histories.

View File

@ -484,7 +484,7 @@ impl AdminRpcHandler {
AdminRpc::MetaOperation(MetaOperation::Snapshot { all: false }), AdminRpc::MetaOperation(MetaOperation::Snapshot { all: false }),
PRIO_NORMAL, PRIO_NORMAL,
) )
.await? .await
})) }))
.await; .await;
@ -497,12 +497,8 @@ impl AdminRpcHandler {
ret.push(format!("{:?}\t{}", to, res_str)); ret.push(format!("{:?}\t{}", to, res_str));
} }
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))) 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?;
Ok(AdminRpc::Ok("Snapshot has been saved.".into())) Ok(AdminRpc::Ok("Snapshot has been saved.".into()))