aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex <alex@adnab.me>2022-10-02 16:41:06 +0200
committerAlex <alex@adnab.me>2022-10-02 16:41:06 +0200
commita096ced35562bd0a8877a1ee2f755be1edafe343 (patch)
treeb2a427054a30f23d512d63d895a4ddd8a98f46e2
parente21b672c96da3c6d01a5ef964aa0ad7a38f8e74c (diff)
parentad917ffd3f76316e48b89ff17e2f8a600a269481 (diff)
downloadgarage-a096ced35562bd0a8877a1ee2f755be1edafe343.tar.gz
garage-a096ced35562bd0a8877a1ee2f755be1edafe343.zip
Merge pull request 'Fix instant substractions that might have panicked' (#398) from fix-time into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/398
-rw-r--r--src/rpc/system.rs4
-rw-r--r--src/table/sync.rs2
-rw-r--r--src/util/metrics.rs16
-rw-r--r--src/util/tranquilizer.rs2
4 files changed, 16 insertions, 8 deletions
diff --git a/src/rpc/system.rs b/src/rpc/system.rs
index f8121193..9e0bfa11 100644
--- a/src/rpc/system.rs
+++ b/src/rpc/system.rs
@@ -369,7 +369,9 @@ impl System {
id: n.id.into(),
addr: n.addr,
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
.get(&n.id.into())
.cloned()
diff --git a/src/table/sync.rs b/src/table/sync.rs
index e34aa8d7..9d79d856 100644
--- a/src/table/sync.rs
+++ b/src/table/sync.rs
@@ -607,7 +607,7 @@ impl<F: TableSchema + 'static, R: TableReplication + 'static> Worker for SyncWor
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();
}
}
diff --git a/src/util/metrics.rs b/src/util/metrics.rs
index 1b05eabe..b882a886 100644
--- a/src/util/metrics.rs
+++ b/src/util/metrics.rs
@@ -1,4 +1,4 @@
-use std::time::SystemTime;
+use std::time::Instant;
use futures::{future::BoxFuture, Future, FutureExt};
use rand::Rng;
@@ -28,10 +28,12 @@ where
attributes: &'a [KeyValue],
) -> BoxFuture<'a, Self::Output> {
async move {
- let request_start = SystemTime::now();
+ let request_start = Instant::now();
let res = self.await;
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,
);
res
@@ -41,9 +43,13 @@ where
fn bound_record_duration(self, r: &'a BoundValueRecorder<f64>) -> BoxFuture<'a, Self::Output> {
async move {
- let request_start = SystemTime::now();
+ let request_start = Instant::now();
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
}
.boxed()
diff --git a/src/util/tranquilizer.rs b/src/util/tranquilizer.rs
index fdb2918b..8a96cbb3 100644
--- a/src/util/tranquilizer.rs
+++ b/src/util/tranquilizer.rs
@@ -36,7 +36,7 @@ impl Tranquilizer {
}
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.sum_observations += observation;