trinity-1686a/garage
2
0
Fork 0
forked from Deuxfleurs/garage
Code Issues Pull requests 1 Projects Releases Wiki Activity

S3 compatibility: return 404 instead of 400 on some multipart commands

Browse source
This commit is contained in:
Alex 2021-02-19 18:51:05 +01:00
parent 55a2a636ca
commit e64ecbdccd
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/api/s3_put.rs
View file

@ -384,9 +384,7 @@ pub async fn handle_put_part(
.iter() .iter()
.any(|v| v.uuid == version_uuid && v.is_uploading()) .any(|v| v.uuid == version_uuid && v.is_uploading())
{ {
return Err(Error::BadRequest(format!( return Err(Error::NotFound);
"Multipart upload does not exist or is otherwise invalid"
)));
} }
// Copy block to store // Copy block to store
@ -438,11 +436,7 @@ pub async fn handle_complete_multipart_upload(
.iter() .iter()
.find(|v| v.uuid == version_uuid && v.is_uploading()); .find(|v| v.uuid == version_uuid && v.is_uploading());
let mut object_version = match object_version { let mut object_version = match object_version {
None => { None => return Err(Error::NotFound),
return Err(Error::BadRequest(format!(
"Multipart upload does not exist or has already been completed"
)))
}
Some(x) => x.clone(), Some(x) => x.clone(),
}; };
@ -532,11 +526,7 @@ pub async fn handle_abort_multipart_upload(
.iter() .iter()
.find(|v| v.uuid == version_uuid && v.is_uploading()); .find(|v| v.uuid == version_uuid && v.is_uploading());
let mut object_version = match object_version { let mut object_version = match object_version {
None => { None => return Err(Error::NotFound),
return Err(Error::BadRequest(format!(
"Multipart upload does not exist or has already been completed"
)))
}
Some(x) => x.clone(), Some(x) => x.clone(),
}; };