fix: Remove multi-parts for deleted objects

Author: St4NNi

components/data_proxy/src/caching/cache.rs

@@ -2,7 +2,7 @@ use super::grpc_query_handler::GrpcQueryHandler;
 use crate::auth::auth::AuthHandler;
 use crate::caching::grpc_query_handler::sort_objects;
 use crate::data_backends::storage_backend::StorageBackend;
-use crate::database::persistence::delete_parts_by_upload_id;
+use crate::database::persistence::{delete_parts_by_object_id, delete_parts_by_upload_id};
 use crate::replication::replication_handler::ReplicationMessage;
 use crate::s3_frontend::data_handler::DataHandler;
 use crate::structs::{
@@ -813,6 +813,7 @@ impl Cache {
             let transaction = client.transaction().await?;
             let transaction_client = transaction.client();
 
+            delete_parts_by_object_id(transaction_client, &id).await?;
             ObjectLocation::delete(&id, transaction_client).await?;
             Object::delete(&id, transaction_client).await?;
 
@@ -835,6 +836,9 @@ impl Cache {
             return Ok(());
         };
 
+        self.multi_parts
+            .retain(|_, v| v.first().map_or(true, |e| e.object_id != id));
+
         let object = old.1 .0.read().await;
         for p in self
             .get_name_trees(&TypedId::from(object.deref()), object.name.clone(), None)

components/data_proxy/src/database/persistence.rs

@@ -218,8 +218,14 @@ pub async fn _get_parts_by_upload_id(
 pub async fn delete_parts_by_upload_id(client: &Client, upload_id: String) -> Result<()> {
     let query = "DELETE FROM multiparts WHERE data->>'upload_id' = $1;";
     let prepared = client.prepare(query).await?;
-    let deleted = client.execute(&prepared, &[&upload_id]).await?;
-    debug!("Deleted {} parts for {}", deleted, upload_id);
+    client.execute(&prepared, &[&upload_id]).await?;
+    Ok(())
+}
+
+pub async fn delete_parts_by_object_id(client: &Client, object_id: &DieselUlid) -> Result<()> {
+    let query = "DELETE FROM multiparts WHERE data->>'object_id' = $1;";
+    let prepared = client.prepare(query).await?;
+    client.execute(&prepared, &[&object_id.to_string()]).await?;
     Ok(())
 }