From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pbs-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id 20ED61FF16B
for <inbox@lore.proxmox.com>; Thu, 14 Nov 2024 14:30:03 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 752DB30CA9;
Thu, 14 Nov 2024 14:30:04 +0100 (CET)
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Thu, 14 Nov 2024 14:29:49 +0100
Message-Id: <20241114132950.3536172-1-t.lamprecht@proxmox.com>
X-Mailer: git-send-email 2.39.5
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.047 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
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 1/2] rrd: relay error to update database to
caller
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>
Reply-To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pbs-devel-bounces@lists.proxmox.com
Sender: "pbs-devel" <pbs-devel-bounces@lists.proxmox.com>
It does not make much sense to just log here, especially as the update
fn has no context about what RRD series it's operating on.
I.e., logged message previously:
> rrd update failed: time in past (...)
vs logged message now:
> rrd::update_value 'host/cpu' failed - time in past (...)
The callers of the Database::update fn in the RRD Cache map can
already handle errors, albeit it won't save the freshly loaded RRD in
the map anymore if the update fails, any load will still do that
though.
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
It might be slightly nicer to factor out the common call to update to
happen after getting/creating the RRD, but it's not trivial to do so as
efficiently due to ownership handover when inserting the RRD in the map.
proxmox-rrd/src/cache/rrd_map.rs | 4 ++--
proxmox-rrd/src/rrd.rs | 14 ++++++--------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/proxmox-rrd/src/cache/rrd_map.rs b/proxmox-rrd/src/cache/rrd_map.rs
index 0ef61cfa..4bcedade 100644
--- a/proxmox-rrd/src/cache/rrd_map.rs
+++ b/proxmox-rrd/src/cache/rrd_map.rs
@@ -42,7 +42,7 @@ impl RRDMap {
) -> Result<(), Error> {
if let Some(rrd) = self.map.get_mut(rel_path) {
if !new_only || time > rrd.last_update() {
- rrd.update(time, value);
+ rrd.update(time, value)?;
}
} else {
let mut path = self.config.basedir.clone();
@@ -61,7 +61,7 @@ impl RRDMap {
};
if !new_only || time > rrd.last_update() {
- rrd.update(time, value);
+ rrd.update(time, value)?;
}
self.map.insert(rel_path.to_string(), rrd);
}
diff --git a/proxmox-rrd/src/rrd.rs b/proxmox-rrd/src/rrd.rs
index 440abe06..4bf4f01b 100644
--- a/proxmox-rrd/src/rrd.rs
+++ b/proxmox-rrd/src/rrd.rs
@@ -469,14 +469,10 @@ impl Database {
/// Update the value (in memory)
///
/// Note: This does not call [Self::save].
- pub fn update(&mut self, time: f64, value: f64) {
- let value = match self.source.compute_new_value(time, value) {
- Ok(value) => value,
- Err(err) => {
- log::error!("rrd update failed: {}", err);
- return;
- }
- };
+ pub fn update(&mut self, time: f64, value: f64) -> Result<(), Error> {
+ let value = self
+ .source
+ .compute_new_value(time, value)?;
let last_update = self.source.last_update;
self.source.last_update = time;
@@ -485,6 +481,8 @@ impl Database {
rra.delete_old_slots(time, last_update);
rra.compute_new_value(time, last_update, value);
}
+
+ Ok(())
}
/// Extract data from the archive
--
2.39.5
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel