Deuxfleurs/garage
43
56
Fork 74
Code Issues 100 Pull requests 13 Releases 30 Wiki Activity

feat: add use_local_tz configuration
All checks were successful
ci/woodpecker/pr/debug Pipeline was successful
Details

Browse source 
Used in lifecycle_worker to determine midnight time
This commit is contained in:
Renjaya Raga Zenta 2024-11-21 15:18:53 +07:00
parent 906c8708fd
commit 4c1bf42192
Signed by untrusted user: ragazenta
GPG key ID: F438322E8235AF65
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -70,7 +70,7 @@ pub fn register_bg_vars(
impl LifecycleWorker { impl LifecycleWorker {
pub fn new(garage: Arc<Garage>, persister: PersisterShared<LifecycleWorkerPersisted>) -> Self { pub fn new(garage: Arc<Garage>, persister: PersisterShared<LifecycleWorkerPersisted>) -> Self {
let today = today(); let today = today(garage.config.use_local_tz);
let last_completed = persister.get_with(|x| { let last_completed = persister.get_with(|x| {
x.last_completed x.last_completed
.as_deref() .as_deref()
@ -205,8 +205,9 @@ impl Worker for LifecycleWorker {
async fn wait_for_work(&mut self) -> WorkerState { async fn wait_for_work(&mut self) -> WorkerState {
match &self.state { match &self.state {
State::Completed(d) => { State::Completed(d) => {
let use_local_tz = self.garage.config.use_local_tz;
let next_day = d.succ_opt().expect("no next day"); let next_day = d.succ_opt().expect("no next day");
let next_start = midnight_ts(next_day); let next_start = midnight_ts(next_day, use_local_tz);
loop { loop {
let now = now_msec(); let now = now_msec();
if now < next_start { if now < next_start {
@ -218,7 +219,7 @@ impl Worker for LifecycleWorker {
break; break;
} }
} }
self.state = State::start(std::cmp::max(next_day, today())); self.state = State::start(std::cmp::max(next_day, today(use_local_tz)));
} }
State::Running { .. } => (), State::Running { .. } => (),
} }
@ -385,10 +386,16 @@ fn check_size_filter(version_data: &ObjectVersionData, filter: &LifecycleFilter)
true true
} }
fn midnight_ts(date: NaiveDate) -> u64 { fn midnight_ts(date: NaiveDate, use_local_tz: bool) -> u64 {
date.and_hms_opt(0, 0, 0) let midnight = date.and_hms_opt(0, 0, 0).expect("midnight does not exist");
.expect("midnight does not exist") if use_local_tz {
.timestamp_millis() as u64 return midnight
.and_local_timezone(Local)
.single()
.expect("bad local midnight")
.timestamp_millis() as u64;
}
midnight.timestamp_millis() as u64
} }
fn next_date(ts: u64) -> NaiveDate { fn next_date(ts: u64) -> NaiveDate {
@ -399,6 +406,9 @@ fn next_date(ts: u64) -> NaiveDate {
.expect("no next day") .expect("no next day")
} }
fn today() -> NaiveDate { fn today(use_local_tz: bool) -> NaiveDate {
if use_local_tz {
return Local::now().naive_local().date();
}
Utc::now().naive_utc().date() Utc::now().naive_utc().date()
} }

4
src/util/config.rs
View file

@ -27,6 +27,10 @@ pub struct Config {
#[serde(default)] #[serde(default)]
pub disable_scrub: bool, pub disable_scrub: bool,
/// Use local timezone
#[serde(default)]
pub use_local_tz: bool,
/// Automatic snapshot interval for metadata /// Automatic snapshot interval for metadata
#[serde(default)] #[serde(default)]
pub metadata_auto_snapshot_interval: Option<String>, pub metadata_auto_snapshot_interval: Option<String>,