From 1cdc321e28ccfbbe425365f3a03a526c3f456e3f Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Thu, 31 Aug 2023 11:36:30 +0200
Subject: [PATCH] lifecycle worker: don't get stuck on non-existent bucket

---
 src/model/s3/lifecycle_worker.rs | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/model/s3/lifecycle_worker.rs b/src/model/s3/lifecycle_worker.rs
index 0747ffb8..ed762413 100644
--- a/src/model/s3/lifecycle_worker.rs
+++ b/src/model/s3/lifecycle_worker.rs
@@ -249,11 +249,22 @@ async fn process_object(
 
 	let bucket = match last_bucket.take() {
 		Some(b) if b.id == object.bucket_id => b,
-		_ => garage
-			.bucket_table
-			.get(&EmptyKey, &object.bucket_id)
-			.await?
-			.ok_or_message("object in non-existent bucket")?,
+		_ => {
+			match garage
+				.bucket_table
+				.get(&EmptyKey, &object.bucket_id)
+				.await?
+			{
+				Some(b) => b,
+				None => {
+					warn!(
+						"Lifecycle worker: object in non-existent bucket {:?}",
+						object.bucket_id
+					);
+					return Ok(Skip::SkipBucket);
+				}
+			}
+		}
 	};
 
 	let lifecycle_policy: &[LifecycleRule] = bucket