diff options
| author | Quentin <quentin@dufour.io> | 2022-01-12 19:04:55 +0100 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2022-01-12 19:04:55 +0100 |
| commit | b4592a00fee3504b80aab9a8ee46bbacf7612e4a (patch) | |
| tree | f4130c9e5553a475598f6101db3ca6059f042f95 /src/garage/admin.rs | |
| parent | 9cb2e9e57ce1aab23d8c3b2aaa7581c8e8b78253 (diff) | |
| download | garage-b4592a00fee3504b80aab9a8ee46bbacf7612e4a.tar.gz garage-b4592a00fee3504b80aab9a8ee46bbacf7612e4a.zip | |
Implement ListMultipartUploads (#171)
Implement ListMultipartUploads, also refactor ListObjects and ListObjectsV2.
It took me some times as I wanted to propose the following things:
- Using an iterator instead of the loop+goto pattern. I find it easier to read and it should enable some optimizations. For example, when consuming keys of a common prefix, we do many [redundant checks](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/branch/main/src/api/s3_list.rs#L125-L156) while the only thing to do is to [check if the following key is still part of the common prefix](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/branch/feature/s3-multipart-compat/src/api/s3_list.rs#L476).
- Try to name things (see ExtractionResult and RangeBegin enums) and to separate concerns (see ListQuery and Accumulator)
- An IO closure to make unit tests possibles.
- Unit tests, to track regressions and document how to interact with the code
- Integration tests with `s3api`. In the future, I would like to move them in Rust with the aws rust SDK.
Merging of the logic of ListMultipartUploads and ListObjects was not a goal but a consequence of the previous modifications.
Some points that we might want to discuss:
- ListObjectsV1, when using pagination and delimiters, has a weird behavior (it lists multiple times the same prefix) with `aws s3api` due to the fact that it can not use our optimization to skip the whole prefix. It is independant from my refactor and can be tested with the commented `s3api` tests in `test-smoke.sh`. It probably has the same weird behavior on the official AWS S3 implementation.
- Considering ListMultipartUploads, I had to "abuse" upload id marker to support prefix skipping. I send an `upload-id-marker` with the hardcoded value `include` to emulate your "including" token.
- Some ways to test ListMultipartUploads with existing software (my tests are limited to s3api for now).
Co-authored-by: Quentin Dufour <quentin@deuxfleurs.fr>
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/171
Co-authored-by: Quentin <quentin@dufour.io>
Co-committed-by: Quentin <quentin@dufour.io>
Diffstat (limited to 'src/garage/admin.rs')
| -rw-r--r-- | src/garage/admin.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/garage/admin.rs b/src/garage/admin.rs index f315c4dc..4a53792d 100644 --- a/src/garage/admin.rs +++ b/src/garage/admin.rs @@ -21,6 +21,7 @@ use garage_model::garage::Garage; use garage_model::helper::error::{Error, OkOrBadRequest}; use garage_model::key_table::*; use garage_model::migrate::Migrate; +use garage_model::object_table::ObjectFilter; use garage_model::permission::*; use crate::cli::*; @@ -209,7 +210,7 @@ impl AdminRpcHandler { let objects = self .garage .object_table - .get_range(&bucket_id, None, Some(DeletedFilter::NotDeleted), 10) + .get_range(&bucket_id, None, Some(ObjectFilter::IsData), 10) .await?; if !objects.is_empty() { return Err(Error::BadRequest(format!( |