Deuxfleurs/garage
48
55
Fork 73
Code Issues 100 Pull requests 15 Releases 30 Wiki Activity

Garage v0.9 #473

Merged
lx merged 175 commits from next into main 2023-10-10 13:28:29 +00:00
Conversation 0 Commits 175 Files changed 120 +20 -5
3 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 942c1f1bfe - Show all commits

5
src/api/s3/multipart.rs
View file

@ -33,12 +33,13 @@ pub async fn handle_create_multipart_upload(
key: &str, key: &str,
) -> Result<Response<Body>, Error> { ) -> Result<Response<Body>, Error> {
let upload_id = gen_uuid(); let upload_id = gen_uuid();
let timestamp = now_msec();
let headers = get_headers(req.headers())?; let headers = get_headers(req.headers())?;
// Create object in object table // Create object in object table
let object_version = ObjectVersion { let object_version = ObjectVersion {
uuid: upload_id, uuid: upload_id,
timestamp: now_msec(), timestamp,
state: ObjectVersionState::Uploading { state: ObjectVersionState::Uploading {
multipart: true, multipart: true,
headers, headers,
@ -50,7 +51,7 @@ pub async fn handle_create_multipart_upload(
// Create multipart upload in mpu table // Create multipart upload in mpu table
// This multipart upload will hold references to uploaded parts // This multipart upload will hold references to uploaded parts
// (which are entries in the Version table) // (which are entries in the Version table)
let mpu = MultipartUpload::new(upload_id, bucket_id, key.into(), false); let mpu = MultipartUpload::new(upload_id, timestamp, bucket_id, key.into(), false);
garage.mpu_table.insert(&mpu).await?; garage.mpu_table.insert(&mpu).await?;
// Send success response // Send success response

11
src/model/s3/mpu_table.rs
View file

@ -27,6 +27,8 @@ mod v09 {
/// Partition key = Upload id = UUID of the object version /// Partition key = Upload id = UUID of the object version
pub upload_id: Uuid, pub upload_id: Uuid,
/// The timestamp at which the multipart upload was created
pub timestamp: u64,
/// Is this multipart upload deleted /// Is this multipart upload deleted
/// The MultipartUpload is marked as deleted as soon as the /// The MultipartUpload is marked as deleted as soon as the
/// multipart upload is either completed or aborted /// multipart upload is either completed or aborted
@ -85,9 +87,16 @@ impl PartialOrd for MpuPartKey {
} }
impl MultipartUpload { impl MultipartUpload {
pub fn new(upload_id: Uuid, bucket_id: Uuid, key: String, deleted: bool) -> Self { pub fn new(
upload_id: Uuid,
timestamp: u64,
bucket_id: Uuid,
key: String,
deleted: bool,
) -> Self {
Self { Self {
upload_id, upload_id,
timestamp,
deleted: crdt::Bool::new(deleted), deleted: crdt::Bool::new(deleted),
parts: crdt::Map::new(), parts: crdt::Map::new(),
bucket_id, bucket_id,

9
src/model/s3/object_table.rs
View file

@ -444,8 +444,13 @@ impl TableSchema for ObjectTable {
), ),
}; };
if delete_mpu { if delete_mpu {
let deleted_mpu = let deleted_mpu = MultipartUpload::new(
MultipartUpload::new(v.uuid, old_v.bucket_id, old_v.key.clone(), true); v.uuid,
v.timestamp,
old_v.bucket_id,
old_v.key.clone(),
true,
);
let res = self.mpu_table.queue_insert(tx, &deleted_mpu); let res = self.mpu_table.queue_insert(tx, &deleted_mpu);
if let Err(e) = db::unabort(res)? { if let Err(e) = db::unabort(res)? {
error!( error!(