Deuxfleurs/garage
41
56
Fork 73
Code Issues 102 Pull requests 14 Releases 30 Wiki Activity

Garage v0.9 #473

Merged
lx merged 175 commits from next into main 2023-10-10 13:28:29 +00:00
Conversation 0 Commits 175 Files changed 120 +3 -3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8e0c020bb9 - Show all commits

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

@ -7,7 +7,7 @@ use tokio::sync::watch;
use garage_util::background::*; use garage_util::background::*;
use garage_util::data::*; use garage_util::data::*;
use garage_util::error::{Error, OkOrMessage}; use garage_util::error::Error;
use garage_util::persister::PersisterShared; use garage_util::persister::PersisterShared;
use garage_util::time::*; use garage_util::time::*;
@ -305,7 +305,7 @@ async fn process_object(
(now_date - version_date) >= chrono::Duration::days(*n_days as i64) (now_date - version_date) >= chrono::Duration::days(*n_days as i64)
} }
LifecycleExpiration::AtDate(exp_date) => { LifecycleExpiration::AtDate(exp_date) => {
if let Ok(exp_date) = parse_lifecycle_date(&exp_date) { if let Ok(exp_date) = parse_lifecycle_date(exp_date) {
now_date >= exp_date now_date >= exp_date
} else { } else {
warn!("Invalid expiration date stored in bucket {:?} lifecycle config: {}", bucket.id, exp_date); warn!("Invalid expiration date stored in bucket {:?} lifecycle config: {}", bucket.id, exp_date);
@ -391,7 +391,7 @@ fn check_size_filter(version_data: &ObjectVersionData, filter: &LifecycleFilter)
return false; return false;
} }
} }
return true; true
} }
fn midnight_ts(date: NaiveDate) -> u64 { fn midnight_ts(date: NaiveDate) -> u64 {