Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add test of out of order UploadPart #7047

Merged
merged 2 commits into from
Feb 3, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add test of out of order UploadPart
tustvold committed Jan 30, 2025
commit f954bc1fa7a30a179cf18d73db192da4f5e92107
1 change: 1 addition & 0 deletions object_store/src/aws/mod.rs
Original file line number Diff line number Diff line change
@@ -571,6 +571,7 @@ mod tests {
stream_get(&integration).await;
multipart(&integration, &integration).await;
multipart_race_condition(&integration, true).await;
multipart_out_of_order(&integration).await;
signing(&integration).await;
s3_encryption(&integration).await;
put_get_attributes(&integration).await;
1 change: 1 addition & 0 deletions object_store/src/azure/mod.rs
Original file line number Diff line number Diff line change
@@ -314,6 +314,7 @@ mod tests {
put_opts(&integration, true).await;
multipart(&integration, &integration).await;
multipart_race_condition(&integration, false).await;
multipart_out_of_order(&integration).await;
signing(&integration).await;

let validate = !integration.client.config().disable_tagging;
1 change: 1 addition & 0 deletions object_store/src/gcp/mod.rs
Original file line number Diff line number Diff line change
@@ -298,6 +298,7 @@ mod test {
stream_get(&integration).await;
multipart(&integration, &integration).await;
multipart_race_condition(&integration, true).await;
multipart_out_of_order(&integration).await;
// Fake GCS server doesn't currently honor preconditions
get_opts(&integration).await;
put_opts(&integration, true).await;
34 changes: 32 additions & 2 deletions object_store/src/integration.rs
Original file line number Diff line number Diff line change
@@ -29,8 +29,8 @@ use core::str;
use crate::multipart::MultipartStore;
use crate::path::Path;
use crate::{
Attribute, Attributes, DynObjectStore, Error, GetOptions, GetRange, ObjectStore, PutMode,
PutPayload, UpdateVersion, WriteMultipart,
Attribute, Attributes, DynObjectStore, Error, GetOptions, GetRange, MultipartUpload,
ObjectStore, PutMode, PutPayload, UpdateVersion, WriteMultipart,
};
use bytes::Bytes;
use futures::stream::FuturesUnordered;
@@ -1196,3 +1196,33 @@ pub async fn multipart_race_condition(storage: &dyn ObjectStore, last_writer_win
));
}
}

/// Tests performing out of order multipart uploads
pub async fn multipart_out_of_order(storage: &dyn ObjectStore) {
let path = Path::from("test_multipart_out_of_order");
let mut multipart_upload = storage.put_multipart(&path).await.unwrap();

let part1 = std::iter::repeat(b'1')
.take(5 * 1024 * 1024)
.collect::<Bytes>();
let part2 = std::iter::repeat(b'2')
.take(5 * 1024 * 1024)
.collect::<Bytes>();
let part3 = std::iter::repeat(b'3')
.take(5 * 1024 * 1024)
.collect::<Bytes>();
let full = [part1.as_ref(), part2.as_ref(), part3.as_ref()].concat();

let fut1 = multipart_upload.put_part(part1.into());
let fut2 = multipart_upload.put_part(part2.into());
let fut3 = multipart_upload.put_part(part3.into());
fut2.await.unwrap();
fut3.await.unwrap();
fut1.await.unwrap();

multipart_upload.complete().await.unwrap();

let result = storage.get(&path).await.unwrap();
let bytes = result.bytes().await.unwrap();
assert_eq!(bytes, full);
}