delete object from S3 if database save fails

aggrec/aggregates.py

@@ -9,6 +9,7 @@
 
 import bson
 import pendulum
+import pymongo
 from bson.objectid import ObjectId
 from fastapi import APIRouter, Header, HTTPException, Request, Response, status
 from fastapi.responses import StreamingResponse
@@ -299,9 +300,15 @@ async def create_aggregate(
             )
         logger.info("Object created: %s", metadata.s3_object_key)
 
-    with tracer.start_as_current_span("mongodb.insert"):
-        metadata.save()
-    logger.info("Metadata saved: %s", metadata.id)
+        with tracer.start_as_current_span("mongodb.insert"):
+            try:
+                with pymongo.timeout(2):
+                    metadata.save(request.app.settings.mongodb.timeout)
+                logger.info("Metadata saved: %s", metadata.id)
+            except Exception as exc:
+                logger.error("Failed to save metadata, deleting object %s", metadata.s3_object_key, exc_info=exc)
+                await s3_client.delete_object(Bucket=s3_bucket, Key=metadata.s3_object_key)
+                raise HTTPException(status.HTTP_502_BAD_GATEWAY, "Database error") from exc
 
     aggregates_counter.add(1, {"aggregate_type": aggregate_type.value})
 

aggrec/settings.py

@@ -29,6 +29,7 @@ class MqttSettings(BaseModel):
 
 class MongoDB(BaseModel):
     server: MongodbUrl | None = Field(default="mongodb://localhost/aggregates")
+    timeout: int = Field(default=5)
 
 
 class S3(BaseModel):