From: Dietmar Maurer <dietmar@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 05/15] proxmox-rrd: remove dependency to proxmox-rrd-api-types
Date: Wed, 13 Oct 2021 10:24:42 +0200 [thread overview]
Message-ID: <20211013082452.619406-6-dietmar@proxmox.com> (raw)
In-Reply-To: <20211013082452.619406-1-dietmar@proxmox.com>
---
proxmox-rrd/Cargo.toml | 2 --
proxmox-rrd/src/cache.rs | 30 ++++++++----------------------
proxmox-rrd/src/rrd.rs | 13 ++++++++++---
src/api2/node/rrd.rs | 9 +++------
src/api2/status.rs | 9 ++-------
src/lib.rs | 32 +++++++++++++++++++++++++++++++-
6 files changed, 54 insertions(+), 41 deletions(-)
diff --git a/proxmox-rrd/Cargo.toml b/proxmox-rrd/Cargo.toml
index b3dd02c3..69a68530 100644
--- a/proxmox-rrd/Cargo.toml
+++ b/proxmox-rrd/Cargo.toml
@@ -17,5 +17,3 @@ serde_cbor = "0.11.1"
proxmox = { version = "0.14.0" }
proxmox-time = "1"
proxmox-schema = { version = "1", features = [ "api-macro" ] }
-
-proxmox-rrd-api-types = { path = "../proxmox-rrd-api-types" }
diff --git a/proxmox-rrd/src/cache.rs b/proxmox-rrd/src/cache.rs
index f14837fc..5e359d9b 100644
--- a/proxmox-rrd/src/cache.rs
+++ b/proxmox-rrd/src/cache.rs
@@ -11,8 +11,6 @@ use nix::fcntl::OFlag;
use proxmox::tools::fs::{atomic_open_or_create_file, create_path, CreateOptions};
-use proxmox_rrd_api_types::{RRDMode, RRDTimeFrameResolution};
-
use crate::rrd::{DST, CF, RRD, RRA};
const RRD_JOURNAL_NAME: &str = "rrd.journal";
@@ -280,35 +278,23 @@ impl RRDCache {
}
/// Extract data from cached RRD
+ ///
+ /// `start`: Start time. If not sepecified, we simply extract 10 data points.
+ /// `end`: End time. Default is to use the current time.
pub fn extract_cached_data(
&self,
base: &str,
name: &str,
- now: f64,
- timeframe: RRDTimeFrameResolution,
- mode: RRDMode,
+ cf: CF,
+ resolution: u64,
+ start: Option<u64>,
+ end: Option<u64>,
) -> Result<Option<(u64, u64, Vec<Option<f64>>)>, Error> {
let state = self.state.read().unwrap();
- let cf = match mode {
- RRDMode::Max => CF::Maximum,
- RRDMode::Average => CF::Average,
- };
-
- let now = now as u64;
-
- let (start, resolution) = match timeframe {
- RRDTimeFrameResolution::Hour => (now - 3600, 60),
- RRDTimeFrameResolution::Day => (now - 3600*24, 60),
- RRDTimeFrameResolution::Week => (now - 3600*24*7, 30*60),
- RRDTimeFrameResolution::Month => (now - 3600*24*30, 30*60),
- RRDTimeFrameResolution::Year => (now - 3600*24*365, 6*60*60),
- RRDTimeFrameResolution::Decade => (now - 10*3600*24*366, 7*86400),
- };
-
match state.rrd_map.get(&format!("{}/{}", base, name)) {
- Some(rrd) => Ok(Some(rrd.extract_data(start, now, cf, resolution)?)),
+ Some(rrd) => Ok(Some(rrd.extract_data(cf, resolution, start, end)?)),
None => Ok(None),
}
}
diff --git a/proxmox-rrd/src/rrd.rs b/proxmox-rrd/src/rrd.rs
index 82fa5a3a..c97be96d 100644
--- a/proxmox-rrd/src/rrd.rs
+++ b/proxmox-rrd/src/rrd.rs
@@ -339,12 +339,15 @@ impl RRD {
///
/// This selects the RRA with specified [CF] and (minimum)
/// resolution, and extract data from `start` to `end`.
+ ///
+ /// `start`: Start time. If not sepecified, we simply extract 10 data points.
+ /// `end`: End time. Default is to use the current time.
pub fn extract_data(
&self,
- start: u64,
- end: u64,
cf: CF,
resolution: u64,
+ start: Option<u64>,
+ end: Option<u64>,
) -> Result<(u64, u64, Vec<Option<f64>>), Error> {
let mut rra: Option<&RRA> = None;
@@ -362,7 +365,11 @@ impl RRD {
}
match rra {
- Some(rra) => Ok(rra.extract_data(start, end, self.source.last_update)),
+ Some(rra) => {
+ let end = end.unwrap_or_else(|| proxmox_time::epoch_f64() as u64);
+ let start = start.unwrap_or(end - 10*rra.resolution);
+ Ok(rra.extract_data(start, end, self.source.last_update))
+ }
None => bail!("unable to find RRA suitable ({:?}:{})", cf, resolution),
}
}
diff --git a/src/api2/node/rrd.rs b/src/api2/node/rrd.rs
index 4fe18f46..21a55bb7 100644
--- a/src/api2/node/rrd.rs
+++ b/src/api2/node/rrd.rs
@@ -9,26 +9,23 @@ use pbs_api_types::{
NODE_SCHEMA, RRDMode, RRDTimeFrameResolution, PRIV_SYS_AUDIT,
};
-use crate::get_rrd_cache;
+use crate::extract_rrd_data;
pub fn create_value_from_rrd(
basedir: &str,
list: &[&str],
timeframe: RRDTimeFrameResolution,
- cf: RRDMode,
+ mode: RRDMode,
) -> Result<Value, Error> {
let mut result: Vec<Value> = Vec::new();
- let now = proxmox_time::epoch_f64();
-
- let rrd_cache = get_rrd_cache()?;
let mut timemap = BTreeMap::new();
let mut last_resolution = None;
for name in list {
- let (start, reso, data) = match rrd_cache.extract_cached_data(basedir, name, now, timeframe, cf)? {
+ let (start, reso, data) = match extract_rrd_data(basedir, name, timeframe, mode)? {
Some(result) => result,
None => continue,
};
diff --git a/src/api2/status.rs b/src/api2/status.rs
index 2476fe97..9a72ce52 100644
--- a/src/api2/status.rs
+++ b/src/api2/status.rs
@@ -22,7 +22,7 @@ use pbs_datastore::DataStore;
use pbs_config::CachedUserInfo;
use crate::tools::statistics::{linear_regression};
-use crate::get_rrd_cache;
+use crate::extract_rrd_data;
#[api(
returns: {
@@ -90,8 +90,6 @@ pub fn datastore_status(
let mut list = Vec::new();
- let rrd_cache = get_rrd_cache()?;
-
for (store, (_, _)) in &config.sections {
let user_privs = user_info.lookup_privs(&auth_id, &["datastore", &store]);
let allowed = (user_privs & (PRIV_DATASTORE_AUDIT| PRIV_DATASTORE_BACKUP)) != 0;
@@ -123,13 +121,10 @@ pub fn datastore_status(
});
let rrd_dir = format!("datastore/{}", store);
- let now = proxmox_time::epoch_f64();
-
- let get_rrd = |what: &str| rrd_cache.extract_cached_data(
+ let get_rrd = |what: &str| extract_rrd_data(
&rrd_dir,
what,
- now,
RRDTimeFrameResolution::Month,
RRDMode::Average,
);
diff --git a/src/lib.rs b/src/lib.rs
index a1ac23bf..6745627a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -10,9 +10,10 @@ use anyhow::{format_err, Error};
use proxmox::tools::fs::CreateOptions;
+use pbs_api_types::{RRDMode, RRDTimeFrameResolution};
use pbs_buildcfg::configdir;
use pbs_tools::cert::CertInfo;
-use proxmox_rrd::RRDCache;
+use proxmox_rrd::{rrd::CF, RRDCache};
#[macro_use]
pub mod tools;
@@ -78,3 +79,32 @@ pub fn initialize_rrd_cache() -> Result<&'static RRDCache, Error> {
Ok(RRD_CACHE.get().unwrap())
}
+
+/// Extracts data for the specified time frame from from RRD cache
+pub fn extract_rrd_data(
+ basedir: &str,
+ name: &str,
+ timeframe: RRDTimeFrameResolution,
+ mode: RRDMode,
+) -> Result<Option<(u64, u64, Vec<Option<f64>>)>, Error> {
+
+ let end = proxmox_time::epoch_f64() as u64;
+
+ let (start, resolution) = match timeframe {
+ RRDTimeFrameResolution::Hour => (end - 3600, 60),
+ RRDTimeFrameResolution::Day => (end - 3600*24, 60),
+ RRDTimeFrameResolution::Week => (end - 3600*24*7, 30*60),
+ RRDTimeFrameResolution::Month => (end - 3600*24*30, 30*60),
+ RRDTimeFrameResolution::Year => (end - 3600*24*365, 6*60*60),
+ RRDTimeFrameResolution::Decade => (end - 10*3600*24*366, 7*86400),
+ };
+
+ let cf = match mode {
+ RRDMode::Max => CF::Maximum,
+ RRDMode::Average => CF::Average,
+ };
+
+ let rrd_cache = get_rrd_cache()?;
+
+ rrd_cache.extract_cached_data(basedir, name, cf, resolution, Some(start), Some(end))
+}
--
2.30.2
next prev parent reply other threads:[~2021-10-13 8:25 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-13 8:24 [pbs-devel] [PATCH proxmox-backup 00/15] RRD database improvements Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 01/15] proxmox-rrd: use a journal to reduce amount of bytes written Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 02/15] RRD_CACHE: use a OnceCell instead of lazy_static Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 03/15] proxmox-backup-proxy: use tokio::task::spawn_blocking instead of block_in_place Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 04/15] proxmox-rrd: implement new CBOR based format Dietmar Maurer
2021-10-13 8:24 ` Dietmar Maurer [this message]
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 06/15] proxmox-rrd: extract_data: include values from current slot Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 07/15] remove proxmox-rrd-api-types crate, s/RRDTimeFrameResolution/RRDTimeFrame/ Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 08/15] proxmox-rrd: support CF::Last Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 09/15] proxmox-rrd: split out load_rrd (cleanup) Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 10/15] proxmox-rrd: add binary to create/manage rrd files Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 11/15] proxmox-rrd: avoid % inside loop Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 12/15] proxmox-rrd: new helper methods - slot() and slot_end_time() Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 13/15] proxmox-rrd: protect against negative update time Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 14/15] proxmox-rrd: rename last_counter to last_value Dietmar Maurer
2021-10-13 8:24 ` [pbs-devel] [PATCH proxmox-backup 15/15] proxmox-rrd: add more commands to the rrd cli tool Dietmar Maurer
2021-10-13 11:58 ` [pbs-devel] applied-series: [PATCH proxmox-backup 00/15] RRD database improvements Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211013082452.619406-6-dietmar@proxmox.com \
--to=dietmar@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox