gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-08-17 09:07:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate S3 api to use new model

Browse Source
This commit is contained in:
Alex Auvolat
2020-07-08 17:33:24 +02:00
parent 84bbbfaa7b
commit 64a6eda0d2
5 changed files with 100 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/s3_delete.rs
+6 -5
View File
@@ -29,7 +29,11 @@ async fn handle_delete_internal(
};
let interesting_versions = object.versions().iter().filter(|v| {
v.data != ObjectVersionData::DeleteMarker && v.state != ObjectVersionState::Aborted
match v.state {
ObjectVersionState::Aborted => false,
ObjectVersionState::Complete(ObjectVersionData::DeleteMarker) => false,
_ => true,
}
});
let mut must_delete = None;
@@ -54,10 +58,7 @@ async fn handle_delete_internal(
vec![ObjectVersion {
uuid: version_uuid,
timestamp: now_msec(),
mime_type: "application/x-delete-marker".into(),
size: 0,
state: ObjectVersionState::Complete,
data: ObjectVersionData::DeleteMarker,
state: ObjectVersionState::Complete(ObjectVersionData::DeleteMarker),
}],
);