aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-10-20 13:20:47 +0200
committerAlex Auvolat <alex@adnab.me>2023-10-20 13:20:47 +0200
commitc6cde1f1437a6cab90b22df6fe0641e5ad34c287 (patch)
tree2f9582304f3393f9b95a5e9d9f6d128f598e6a66
parentd146cdd5b66ca1d3ed65ce93ca42c6db22defc09 (diff)
downloadgarage-c6cde1f1437a6cab90b22df6fe0641e5ad34c287.tar.gz
garage-c6cde1f1437a6cab90b22df6fe0641e5ad34c287.zip
remove now-unused key parameter in check_quotas
-rw-r--r--src/api/s3/multipart.rs2
-rw-r--r--src/api/s3/put.rs5
2 files changed, 3 insertions, 4 deletions
diff --git a/src/api/s3/multipart.rs b/src/api/s3/multipart.rs
index 978ad9cf..672ab198 100644
--- a/src/api/s3/multipart.rs
+++ b/src/api/s3/multipart.rs
@@ -332,7 +332,7 @@ pub async fn handle_complete_multipart_upload(
// Calculate total size of final object
let total_size = parts.iter().map(|x| x.size.unwrap()).sum();
- if let Err(e) = check_quotas(&garage, bucket, &key, total_size, Some(&object)).await {
+ if let Err(e) = check_quotas(&garage, bucket, total_size, Some(&object)).await {
object_version.state = ObjectVersionState::Aborted;
let final_object = Object::new(bucket.id, key.clone(), vec![object_version]);
garage.object_table.insert(&final_object).await?;
diff --git a/src/api/s3/put.rs b/src/api/s3/put.rs
index a3fe9cca..62a1f76a 100644
--- a/src/api/s3/put.rs
+++ b/src/api/s3/put.rs
@@ -110,7 +110,7 @@ pub(crate) async fn save_stream<S: Stream<Item = Result<Bytes, Error>> + Unpin>(
content_sha256,
)?;
- check_quotas(&garage, bucket, key, size, existing_object.as_ref()).await?;
+ check_quotas(&garage, bucket, size, existing_object.as_ref()).await?;
let object_version = ObjectVersion {
uuid: version_uuid,
@@ -189,7 +189,7 @@ pub(crate) async fn save_stream<S: Stream<Item = Result<Bytes, Error>> + Unpin>(
content_sha256,
)?;
- check_quotas(&garage, bucket, key, total_size, existing_object.as_ref()).await?;
+ check_quotas(&garage, bucket, total_size, existing_object.as_ref()).await?;
// Save final object state, marked as Complete
let md5sum_hex = hex::encode(data_md5sum);
@@ -242,7 +242,6 @@ pub(crate) fn ensure_checksum_matches(
pub(crate) async fn check_quotas(
garage: &Arc<Garage>,
bucket: &Bucket,
- key: &str,
size: u64,
prev_object: Option<&Object>,
) -> Result<(), Error> {