mirrors/garage
1
0
Fork 0
mirror of https://git.deuxfleurs.fr/Deuxfleurs/garage.git synced 2024-11-28 19:11:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request 'Fix instant substractions that might have panicked' (#398) from fix-time into main

Browse source 
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/398
This commit is contained in:
Alex 2022-10-02 16:41:06 +02:00
commit a096ced355
4 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/rpc/system.rs
View file

@ -369,7 +369,9 @@ impl System {
id: n.id.into(), id: n.id.into(),
addr: n.addr, addr: n.addr,
is_up: n.is_up(), is_up: n.is_up(),
last_seen_secs_ago: n.last_seen.map(|t| (Instant::now() - t).as_secs()), last_seen_secs_ago: n
.last_seen
.map(|t| (Instant::now().saturating_duration_since(t)).as_secs()),
status: node_status status: node_status
.get(&n.id.into()) .get(&n.id.into())
.cloned() .cloned()

2
src/table/sync.rs
View file

@ -607,7 +607,7 @@ impl<F: TableSchema + 'static, R: TableReplication + 'static> Worker for SyncWor
self.add_full_sync(); self.add_full_sync();
} }
}, },
_ = tokio::time::sleep(self.next_full_sync - Instant::now()) => { _ = tokio::time::sleep_until(self.next_full_sync.into()) => {
self.add_full_sync(); self.add_full_sync();
} }
} }

16
src/util/metrics.rs
View file

@ -1,4 +1,4 @@
use std::time::SystemTime; use std::time::Instant;
use futures::{future::BoxFuture, Future, FutureExt}; use futures::{future::BoxFuture, Future, FutureExt};
use rand::Rng; use rand::Rng;
@ -28,10 +28,12 @@ where
attributes: &'a [KeyValue], attributes: &'a [KeyValue],
) -> BoxFuture<'a, Self::Output> { ) -> BoxFuture<'a, Self::Output> {
async move { async move {
let request_start = SystemTime::now(); let request_start = Instant::now();
let res = self.await; let res = self.await;
r.record( r.record(
request_start.elapsed().map_or(0.0, |d| d.as_secs_f64()), Instant::now()
.saturating_duration_since(request_start)
.as_secs_f64(),
attributes, attributes,
); );
res res
@ -41,9 +43,13 @@ where
fn bound_record_duration(self, r: &'a BoundValueRecorder<f64>) -> BoxFuture<'a, Self::Output> { fn bound_record_duration(self, r: &'a BoundValueRecorder<f64>) -> BoxFuture<'a, Self::Output> {
async move { async move {
let request_start = SystemTime::now(); let request_start = Instant::now();
let res = self.await; let res = self.await;
r.record(request_start.elapsed().map_or(0.0, |d| d.as_secs_f64())); r.record(
Instant::now()
.saturating_duration_since(request_start)
.as_secs_f64(),
);
res res
} }
.boxed() .boxed()

2
src/util/tranquilizer.rs
View file

@ -36,7 +36,7 @@ impl Tranquilizer {
} }
fn tranquilize_internal(&mut self, tranquility: u32) -> Option<Duration> { fn tranquilize_internal(&mut self, tranquility: u32) -> Option<Duration> {
let observation = Instant::now() - self.last_step_begin; let observation = Instant::now().saturating_duration_since(self.last_step_begin);
self.observations.push_back(observation); self.observations.push_back(observation);
self.sum_observations += observation; self.sum_observations += observation;