From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 77D7F75364 for ; Wed, 13 Oct 2021 10:25:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7D16EE5C1 for ; Wed, 13 Oct 2021 10:25:01 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id E3BBBE513 for ; Wed, 13 Oct 2021 10:24:57 +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 B756745DE5; Wed, 13 Oct 2021 10:24:57 +0200 (CEST) From: Dietmar Maurer To: pbs-devel@lists.proxmox.com Date: Wed, 13 Oct 2021 10:24:51 +0200 Message-Id: <20211013082452.619406-15-dietmar@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211013082452.619406-1-dietmar@proxmox.com> References: <20211013082452.619406-1-dietmar@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.547 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: [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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Oct 2021 08:25:03 -0000 --- 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