Deuxfleurs/garage
32
61
Fork 80
Code Issues 91 Pull requests 14 Releases 31 Wiki Activity

WIP: v1.99-internal version for Deuxfleurs use only #964

Draft
lx wants to merge 165 commits from v1.99-internal into hotfix/1.0.0-rc1-red-ftr-wquorum
pull from: v1.99-internal
merge into: Deuxfleurs:hotfix/1.0.0-rc1-red-ftr-wquorum
Conversation 0 Commits 165 Files changed 173 +6 -2
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 63f20bdeab - Show all commits

8
src/garage/admin/mod.rs
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,7 +497,11 @@ 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(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 } => { MetaOperation::Snapshot { all: false } => {
garage_model::snapshot::async_snapshot_metadata(&self.garage).await?; garage_model::snapshot::async_snapshot_metadata(&self.garage).await?;