From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <dietmar@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (2048 bits))
 (No client certificate requested)
 by lists.proxmox.com (Postfix) with ESMTPS id E98D47547E
 for <pbs-devel@lists.proxmox.com>; Wed, 13 Oct 2021 11:52:29 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
 by firstgate.proxmox.com (Proxmox) with ESMTP id E06DCFD4B
 for <pbs-devel@lists.proxmox.com>; Wed, 13 Oct 2021 11:52:29 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
 [94.136.29.106])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
 (No client certificate requested)
 by firstgate.proxmox.com (Proxmox) with ESMTPS id 5252FFD3D
 for <pbs-devel@lists.proxmox.com>; Wed, 13 Oct 2021 11:52:29 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
 by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 2B7A145DB2
 for <pbs-devel@lists.proxmox.com>; Wed, 13 Oct 2021 11:52:29 +0200 (CEST)
Date: Wed, 13 Oct 2021 11:51:02 +0200 (CEST)
From: Dietmar Maurer <dietmar@proxmox.com>
To: pbs-devel@lists.proxmox.com
Message-ID: <14529285.1981.1634118662433@webmail.proxmox.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-Priority: 3
Importance: Normal
X-Mailer: Open-Xchange Mailer v7.10.5-Rev25
X-Originating-Client: open-xchange-appsuite
X-SPAM-LEVEL: Spam detection results:  0
 AWL 0.535 Adjusted score from AWL reputation of From: address
 BAYES_00                 -1.9 Bayes spam probability is 0 to 1%
 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
 SPF_HELO_NONE           0.001 SPF: HELO does not publish an SPF Record
 SPF_PASS               -0.001 SPF: sender matches SPF record
 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
 http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
 information. [rrd.rs]
Subject: Re: [pbs-devel] [PATCH proxmox-backup 14/15] proxmox-rrd: rename
 last_counter to last_value
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
 <pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>, 
 <mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>, 
 <mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 13 Oct 2021 09:52:30 -0000

This introduces a bug: here is the fix

diff --git a/proxmox-rrd/src/rrd.rs b/proxmox-rrd/src/rrd.rs
index c6996e42..eb6154e7 100644
--- a/proxmox-rrd/src/rrd.rs
+++ b/proxmox-rrd/src/rrd.rs
@@ -107,11 +107,12 @@ impl DataSource {
             } else {
                 value - self.last_value
             };
+            self.last_value = value;
             value = diff/time_diff;
+        } else {
+            self.last_value = value;
         }
 
-        self.last_value = value;
-
         Ok(value)
     }
 



> On 10/13/2021 10:24 AM Dietmar Maurer <dietmar@proxmox.com> wrote:
> 
>  
> ---
>  proxmox-rrd/src/rrd.rs    | 25 +++++++++++++++----------
>  proxmox-rrd/src/rrd_v1.rs |  2 +-
>  2 files changed, 16 insertions(+), 11 deletions(-)
> 
> diff --git a/proxmox-rrd/src/rrd.rs b/proxmox-rrd/src/rrd.rs
> index 7901fe39..72769bfd 100644
> --- a/proxmox-rrd/src/rrd.rs
> +++ b/proxmox-rrd/src/rrd.rs
> @@ -63,7 +63,7 @@ pub struct DataSource {
>      pub last_update: f64,
>      /// Stores the last value, used to compute differential value for
>      /// derive/counters
> -    pub counter_value: f64,
> +    pub last_value: f64,
>  }
>  
>  impl DataSource {
> @@ -72,7 +72,7 @@ impl DataSource {
>          Self {
>              dst,
>              last_update: 0.0,
> -            counter_value: f64::NAN,
> +            last_value: f64::NAN,
>          }
>      }
>  
> @@ -94,23 +94,24 @@ impl DataSource {
>          if is_counter || self.dst == DST::Derive {
>              let time_diff = time - self.last_update;
>  
> -            let diff = if self.counter_value.is_nan() {
> +            let diff = if self.last_value.is_nan() {
>                  0.0
>              } else if is_counter && value < 0.0 {
>                  bail!("got negative value for counter");
> -            } else if is_counter && value < self.counter_value {
> +            } else if is_counter && value < self.last_value {
>                  // Note: We do not try automatic overflow corrections, but
> -                // we update counter_value anyways, so that we can compute the diff
> +                // we update last_value anyways, so that we can compute the diff
>                  // next time.
> -                self.counter_value = value;
> +                self.last_value = value;
>                  bail!("conter overflow/reset detected");
>              } else {
> -                value - self.counter_value
> +                value - self.last_value
>              };
> -            self.counter_value = value;
>              value = diff/time_diff;
>          }
>  
> +        self.last_value = value;
> +
>          Ok(value)
>      }
>  
> @@ -138,11 +139,15 @@ impl RRA {
>          }
>      }
>  
> -    fn slot_end_time(&self, time: u64) -> u64 {
> +    pub fn slot_end_time(&self, time: u64) -> u64 {
>          self.resolution*(time/self.resolution + 1)
>      }
>  
> -    fn slot(&self, time: u64) -> usize {
> +    pub fn slot_start_time(&self, time: u64) -> u64 {
> +        self.resolution*(time/self.resolution)
> +    }
> +
> +    pub fn slot(&self, time: u64) -> usize {
>          ((time/self.resolution) as usize) % self.data.len()
>      }
>  
> diff --git a/proxmox-rrd/src/rrd_v1.rs b/proxmox-rrd/src/rrd_v1.rs
> index 511b510b..7e4b97c2 100644
> --- a/proxmox-rrd/src/rrd_v1.rs
> +++ b/proxmox-rrd/src/rrd_v1.rs
> @@ -285,7 +285,7 @@ impl RRDv1 {
>  
>          let source = DataSource {
>              dst,
> -            counter_value: f64::NAN,
> +            last_value: f64::NAN,
>              last_update:  self.hour_avg.last_update, // IMPORTANT!
>          };
>          Ok(RRD {
> -- 
> 2.30.2