* [pbs-devel] [PATCH proxmox-backup] rrd: use saturating_sub to avoid underflow
@ 2021-10-28 9:40 Dominik Csapak
2021-10-28 10:56 ` [pbs-devel] applied: " Wolfgang Bumiller
0 siblings, 1 reply; 2+ messages in thread
From: Dominik Csapak @ 2021-10-28 9:40 UTC (permalink / raw)
To: pbs-devel
Without this, the tests fail in debug mode.
Also having start (u64) underflow to a value greater than end does
not really make sense
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
proxmox-rrd/src/rrd.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/proxmox-rrd/src/rrd.rs b/proxmox-rrd/src/rrd.rs
index 20bf6ae3..2fab9df3 100644
--- a/proxmox-rrd/src/rrd.rs
+++ b/proxmox-rrd/src/rrd.rs
@@ -469,7 +469,7 @@ impl RRD {
match rra {
Some(rra) => {
let end = end.unwrap_or_else(|| proxmox_time::epoch_f64() as u64);
- let start = start.unwrap_or(end - 10*rra.resolution);
+ let start = start.unwrap_or(end.saturating_sub(10*rra.resolution));
Ok(rra.extract_data(start, end, self.source.last_update))
}
None => bail!("unable to find RRA suitable ({:?}:{})", cf, resolution),
--
2.30.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pbs-devel] applied: [PATCH proxmox-backup] rrd: use saturating_sub to avoid underflow
2021-10-28 9:40 [pbs-devel] [PATCH proxmox-backup] rrd: use saturating_sub to avoid underflow Dominik Csapak
@ 2021-10-28 10:56 ` Wolfgang Bumiller
0 siblings, 0 replies; 2+ messages in thread
From: Wolfgang Bumiller @ 2021-10-28 10:56 UTC (permalink / raw)
To: Dominik Csapak; +Cc: pbs-devel
applied
On Thu, Oct 28, 2021 at 11:40:44AM +0200, Dominik Csapak wrote:
> Without this, the tests fail in debug mode.
> Also having start (u64) underflow to a value greater than end does
> not really make sense
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> proxmox-rrd/src/rrd.rs | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/proxmox-rrd/src/rrd.rs b/proxmox-rrd/src/rrd.rs
> index 20bf6ae3..2fab9df3 100644
> --- a/proxmox-rrd/src/rrd.rs
> +++ b/proxmox-rrd/src/rrd.rs
> @@ -469,7 +469,7 @@ impl RRD {
> match rra {
> Some(rra) => {
> let end = end.unwrap_or_else(|| proxmox_time::epoch_f64() as u64);
> - let start = start.unwrap_or(end - 10*rra.resolution);
> + let start = start.unwrap_or(end.saturating_sub(10*rra.resolution));
> Ok(rra.extract_data(start, end, self.source.last_update))
> }
> None => bail!("unable to find RRA suitable ({:?}:{})", cf, resolution),
> --
> 2.30.2
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-28 10:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-28 9:40 [pbs-devel] [PATCH proxmox-backup] rrd: use saturating_sub to avoid underflow Dominik Csapak
2021-10-28 10:56 ` [pbs-devel] applied: " Wolfgang Bumiller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal