kaiyou/garage
1
0
Fork 0
forked from Deuxfleurs/garage
Code Pull requests Releases Activity

lifecycle worker: don't get stuck on non-existent bucket

Browse source
This commit is contained in:
Alex 2023-08-31 11:36:30 +02:00
parent f579d6d9b4
commit 1cdc321e28
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/model/s3/lifecycle_worker.rs
View file

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