jpds/garage
1
0
Fork 0
forked from Deuxfleurs/garage
Code Issues 29 Pull requests Projects Releases Packages Wiki Activity

Fix error messages

Browse source
This commit is contained in:
Alex 2022-12-13 16:16:49 +01:00
parent 041b60ed1d
commit d1279e04f3
Signed by untrusted user: lx
GPG key ID: 0E496D15096376BE
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/garage/admin.rs
View file

@ -1005,10 +1005,9 @@ impl AdminRpcHandler {
BlockOperation::RetryNow { all, blocks } => { BlockOperation::RetryNow { all, blocks } => {
if *all { if *all {
if !blocks.is_empty() { if !blocks.is_empty() {
return Err(GarageError::Message( return Err(Error::BadRequest(
"--all was specified, cannot also specify blocks".into(), "--all was specified, cannot also specify blocks".into(),
) ));
.into());
} }
let blocks = self.garage.block_manager.list_resync_errors()?; let blocks = self.garage.block_manager.list_resync_errors()?;
for b in blocks.iter() { for b in blocks.iter() {
@ -1032,10 +1031,9 @@ impl AdminRpcHandler {
} }
BlockOperation::Purge { yes, blocks } => { BlockOperation::Purge { yes, blocks } => {
if !yes { if !yes {
return Err(GarageError::Message( return Err(Error::BadRequest(
"Pass the --yes flag to confirm block purge operation.".into(), "Pass the --yes flag to confirm block purge operation.".into(),
) ));
.into());
} }
let mut obj_dels = 0; let mut obj_dels = 0;