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 2F82673A07 for ; Fri, 8 Oct 2021 10:05:28 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 24820236B9 for ; Fri, 8 Oct 2021 10:04:58 +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 534BB236AF for ; Fri, 8 Oct 2021 10:04: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 18EDF4598E; Fri, 8 Oct 2021 10:04:57 +0200 (CEST) From: Dietmar Maurer To: pbs-devel@lists.proxmox.com Date: Fri, 8 Oct 2021 10:04:54 +0200 Message-Id: <20211008080454.1844879-2-dietmar@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211008080454.1844879-1-dietmar@proxmox.com> References: <20211008080454.1844879-1-dietmar@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.561 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. [proxmox-backup-api.rs, status.rs, proxmox-backup-proxy.rs, rrd.rs, lib.rs] Subject: [pbs-devel] [patch proxmox-backup 2/2] RRD_CACHE: use a OnceCell instead of lazy_static 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: Fri, 08 Oct 2021 08:05:28 -0000 And initialize only with proxmox-backup-proxy. Other binaries dont need it. --- src/api2/node/rrd.rs | 6 ++-- src/api2/status.rs | 7 ++-- src/bin/proxmox-backup-api.rs | 4 --- src/bin/proxmox-backup-proxy.rs | 17 +++++++--- src/lib.rs | 59 +++++++++++++++++++++------------ 5 files changed, 59 insertions(+), 34 deletions(-) diff --git a/src/api2/node/rrd.rs b/src/api2/node/rrd.rs index 00555030..49d2f570 100644 --- a/src/api2/node/rrd.rs +++ b/src/api2/node/rrd.rs @@ -9,7 +9,7 @@ use pbs_api_types::{ use proxmox_rrd::rrd::RRD_DATA_ENTRIES; -use crate::RRD_CACHE; +use crate::get_rrd_cache; pub fn create_value_from_rrd( basedir: &str, @@ -21,8 +21,10 @@ pub fn create_value_from_rrd( let mut result = Vec::new(); let now = proxmox::tools::time::epoch_f64(); + let rrd_cache = get_rrd_cache()?; + for name in list { - let (start, reso, list) = match RRD_CACHE.extract_cached_data(basedir, name, now, timeframe, cf) { + let (start, reso, list) = match rrd_cache.extract_cached_data(basedir, name, now, timeframe, cf) { Some(result) => result, None => continue, }; diff --git a/src/api2/status.rs b/src/api2/status.rs index 548e5319..2cef1e9b 100644 --- a/src/api2/status.rs +++ b/src/api2/status.rs @@ -23,7 +23,7 @@ use pbs_datastore::DataStore; use pbs_config::CachedUserInfo; use crate::tools::statistics::{linear_regression}; -use crate::RRD_CACHE; +use crate::get_rrd_cache; #[api( returns: { @@ -91,6 +91,8 @@ 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; @@ -124,7 +126,8 @@ pub fn datastore_status( let rrd_dir = format!("datastore/{}", store); let now = proxmox::tools::time::epoch_f64(); - let get_rrd = |what: &str| RRD_CACHE.extract_cached_data( + + let get_rrd = |what: &str| rrd_cache.extract_cached_data( &rrd_dir, what, now, diff --git a/src/bin/proxmox-backup-api.rs b/src/bin/proxmox-backup-api.rs index b7c4e689..b17b3436 100644 --- a/src/bin/proxmox-backup-api.rs +++ b/src/bin/proxmox-backup-api.rs @@ -17,7 +17,6 @@ use proxmox_rest_server::{daemon, AuthError, ApiConfig, RestServer, RestEnvironm use proxmox_backup::server::auth::check_pbs_auth; use proxmox_backup::auth_helpers::*; -use proxmox_backup::RRD_CACHE; use proxmox_backup::config; fn main() { @@ -74,9 +73,6 @@ async fn run() -> Result<(), Error> { config::update_self_signed_cert(false)?; proxmox_backup::server::create_run_dir()?; - - RRD_CACHE.apply_journal()?; - proxmox_backup::server::jobstate::create_jobstate_dir()?; proxmox_backup::tape::create_tape_status_dir()?; proxmox_backup::tape::create_drive_state_dir()?; diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs index ce939400..ef227556 100644 --- a/src/bin/proxmox-backup-proxy.rs +++ b/src/bin/proxmox-backup-proxy.rs @@ -32,7 +32,7 @@ use proxmox_rest_server::{ }; use proxmox_backup::{ - RRD_CACHE, + get_rrd_cache, initialize_rrd_cache, server::{ auth::check_pbs_auth, jobstate::{ @@ -208,6 +208,9 @@ async fn run() -> Result<(), Error> { let _ = public_auth_key(); // load with lazy_static let _ = csrf_secret(); // load with lazy_static + let rrd_cache = initialize_rrd_cache()?; + rrd_cache.apply_journal()?; + let mut config = ApiConfig::new( pbs_buildcfg::JS_DIR, &proxmox_backup::api2::ROUTER, @@ -901,14 +904,18 @@ async fn run_stat_generator() { } fn rrd_update_gauge(name: &str, value: f64) { - if let Err(err) = RRD_CACHE.update_value(name, value, DST::Gauge) { - eprintln!("rrd::update_value '{}' failed - {}", name, err); + if let Ok(rrd_cache) = get_rrd_cache() { + if let Err(err) = rrd_cache.update_value(name, value, DST::Gauge) { + eprintln!("rrd::update_value '{}' failed - {}", name, err); + } } } fn rrd_update_derive(name: &str, value: f64) { - if let Err(err) = RRD_CACHE.update_value(name, value, DST::Derive) { - eprintln!("rrd::update_value '{}' failed - {}", name, err); + if let Ok(rrd_cache) = get_rrd_cache() { + if let Err(err) = rrd_cache.update_value(name, value, DST::Derive) { + eprintln!("rrd::update_value '{}' failed - {}", name, err); + } } } diff --git a/src/lib.rs b/src/lib.rs index 5d2b4590..a1ac23bf 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -5,6 +5,9 @@ use std::path::PathBuf; +use once_cell::sync::OnceCell; +use anyhow::{format_err, Error}; + use proxmox::tools::fs::CreateOptions; use pbs_buildcfg::configdir; @@ -39,25 +42,39 @@ pub fn cert_info() -> Result { CertInfo::from_path(PathBuf::from(configdir!("/proxy.pem"))) } -lazy_static::lazy_static!{ - /// Proxmox Backup Server RRD cache instance - pub static ref RRD_CACHE: RRDCache = { - let backup_user = pbs_config::backup_user().unwrap(); - let file_options = CreateOptions::new() - .owner(backup_user.uid) - .group(backup_user.gid); - - let dir_options = CreateOptions::new() - .owner(backup_user.uid) - .group(backup_user.gid); - - let apply_interval = 30.0*60.0; // 30 minutes - - RRDCache::new( - "/var/lib/proxmox-backup/rrdb", - Some(file_options), - Some(dir_options), - apply_interval, - ).unwrap() - }; +pub static RRD_CACHE: OnceCell = OnceCell::new(); + +/// Get the RRD cache instance +pub fn get_rrd_cache() -> Result<&'static RRDCache, Error> { + RRD_CACHE.get().ok_or_else(|| format_err!("RRD cache not initialized!")) +} + +/// Initialize the RRD cache instance +/// +/// Note: Only a single process must do this (proxmox-backup-proxy) +pub fn initialize_rrd_cache() -> Result<&'static RRDCache, Error> { + + let backup_user = pbs_config::backup_user()?; + + let file_options = CreateOptions::new() + .owner(backup_user.uid) + .group(backup_user.gid); + + let dir_options = CreateOptions::new() + .owner(backup_user.uid) + .group(backup_user.gid); + + let apply_interval = 30.0*60.0; // 30 minutes + + let cache = RRDCache::new( + "/var/lib/proxmox-backup/rrdb", + Some(file_options), + Some(dir_options), + apply_interval, + )?; + + RRD_CACHE.set(cache) + .map_err(|_| format_err!("RRD cache already initialized!"))?; + + Ok(RRD_CACHE.get().unwrap()) } -- 2.30.2