diff options
| author | Quentin <quentin@deuxfleurs.fr> | 2020-11-21 10:52:27 +0100 |
|---|---|---|
| committer | Quentin <quentin@deuxfleurs.fr> | 2020-11-21 10:52:27 +0100 |
| commit | 2f6eca4ef36b662be841454774af55fe84f42d6a (patch) | |
| tree | c6d7b5e5b0bedd66a4c2afacebb32760b5ed924b /src/garage | |
| parent | 5b363626f4803b3e43cdb450fd6ee04ac9429c4d (diff) | |
| parent | 5dc304ac41c2ae0699fbdd56117b60c517a1ad39 (diff) | |
| download | garage-2f6eca4ef36b662be841454774af55fe84f42d6a.tar.gz garage-2f6eca4ef36b662be841454774af55fe84f42d6a.zip | |
Merge remote-tracking branch 'origin/master' into feature/website
Diffstat (limited to 'src/garage')
| -rw-r--r-- | src/garage/admin_rpc.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/garage/admin_rpc.rs b/src/garage/admin_rpc.rs index b29f2f77..778e4a1d 100644 --- a/src/garage/admin_rpc.rs +++ b/src/garage/admin_rpc.rs @@ -67,7 +67,7 @@ impl AdminRpcHandler { let bucket_names = self .garage .bucket_table - .get_range(&EmptyKey, None, Some(()), 10000) + .get_range(&EmptyKey, None, Some(DeletedFilter::NotDeleted), 10000) .await? .iter() .map(|b| b.name.to_string()) @@ -101,7 +101,7 @@ impl AdminRpcHandler { let objects = self .garage .object_table - .get_range(&query.name, None, Some(()), 10) + .get_range(&query.name, None, Some(DeletedFilter::NotDeleted), 10) .await?; if !objects.is_empty() { return Err(Error::BadRPC(format!("Bucket {} is not empty", query.name))); @@ -170,7 +170,7 @@ impl AdminRpcHandler { let key_ids = self .garage .key_table - .get_range(&EmptyKey, None, Some(()), 10000) + .get_range(&EmptyKey, None, Some(DeletedFilter::NotDeleted), 10000) .await? .iter() .map(|k| (k.key_id.to_string(), k.name.to_string())) |