forked from Deuxfleurs/garage
Fix error messages
This commit is contained in:
parent
041b60ed1d
commit
d1279e04f3
1 changed files with 4 additions and 6 deletions
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue