all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup v6 05/22] datastore: expose request counters for s3 backed datastores
Date: Thu, 19 Mar 2026 10:40:43 +0100	[thread overview]
Message-ID: <20260319094100.240765-18-c.ebner@proxmox.com> (raw)
In-Reply-To: <20260319094100.240765-1-c.ebner@proxmox.com>

Allows to introspect the current state of the request counters
related to a datastore and collect the current counter statistics.

Whenever a datastore is loaded (not cached), the shared request
counters are opened via the mmapped file and stored in the datastore.
This allows for all successive accesses to the datastore to reuse the
pre-opened shared request counters. Counter states are always loaded
with Ordering::Acquire to assure the state is in sync with all
concurrent threads.

This will be subsequently used to show the request counter statistics
in the ui and use them for threshold exceeding notifications via the
notification system.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
 pbs-datastore/src/datastore.rs | 92 +++++++++++++++++++++++++---------
 src/api2/admin/datastore.rs    |  3 ++
 2 files changed, 72 insertions(+), 23 deletions(-)

diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
index f88f323df..71297af08 100644
--- a/pbs-datastore/src/datastore.rs
+++ b/pbs-datastore/src/datastore.rs
@@ -3,12 +3,14 @@ use std::io::{self, Write};
 use std::os::unix::ffi::OsStrExt;
 use std::os::unix::io::AsRawFd;
 use std::path::{Path, PathBuf};
+use std::sync::atomic::Ordering;
 use std::sync::{Arc, LazyLock, Mutex};
 use std::time::{Duration, SystemTime};
 
 use anyhow::{bail, format_err, Context, Error};
 use http_body_util::BodyExt;
 use hyper::body::Bytes;
+use hyper::Method;
 use nix::unistd::{unlinkat, UnlinkatFlags};
 use pbs_tools::lru_cache::LruCache;
 use tokio::io::AsyncWriteExt;
@@ -17,7 +19,7 @@ use tracing::{info, warn};
 use proxmox_human_byte::HumanByte;
 use proxmox_s3_client::{
     S3Client, S3ClientConf, S3ClientOptions, S3ObjectKey, S3PathPrefix, S3RateLimiterOptions,
-    S3RequestCounterOptions,
+    S3RequestCounterOptions, SharedRequestCounters,
 };
 use proxmox_schema::ApiType;
 
@@ -32,7 +34,7 @@ use pbs_api_types::{
     ArchiveType, Authid, BackupGroupDeleteStats, BackupNamespace, BackupType, ChunkOrder,
     DataStoreConfig, DatastoreBackendConfig, DatastoreBackendType, DatastoreFSyncLevel,
     DatastoreTuning, GarbageCollectionCacheStats, GarbageCollectionStatus, MaintenanceMode,
-    MaintenanceType, Operation, UPID,
+    MaintenanceType, Operation, S3Statistics, UPID,
 };
 use pbs_config::s3::S3_CFG_TYPE_ID;
 use pbs_config::{BackupLockGuard, ConfigVersionCache};
@@ -177,6 +179,7 @@ pub struct DataStoreImpl {
     /// datastore.cfg cache generation number at lookup time, used to
     /// invalidate this cached `DataStoreImpl`
     config_generation: Option<usize>,
+    request_counters: Option<Arc<SharedRequestCounters>>,
 }
 
 impl DataStoreImpl {
@@ -194,6 +197,7 @@ impl DataStoreImpl {
             lru_store_caching: None,
             thread_settings: Default::default(),
             config_generation: None,
+            request_counters: None,
         })
     }
 }
@@ -456,6 +460,22 @@ impl DataStore {
         self.inner.backend_config.ty.unwrap_or_default()
     }
 
+    /// Get the s3 statistics for this datastore
+    pub fn s3_statistics(&self) -> Option<S3Statistics> {
+        self.inner
+            .request_counters
+            .as_ref()
+            .map(|counters| S3Statistics {
+                get: counters.load(Method::GET, Ordering::Acquire),
+                put: counters.load(Method::PUT, Ordering::Acquire),
+                post: counters.load(Method::POST, Ordering::Acquire),
+                delete: counters.load(Method::DELETE, Ordering::Acquire),
+                head: counters.load(Method::HEAD, Ordering::Acquire),
+                uploaded: counters.get_upload_traffic(Ordering::Acquire),
+                downloaded: counters.get_download_traffic(Ordering::Acquire),
+            })
+    }
+
     pub fn cache(&self) -> Option<&LocalDatastoreLruCache> {
         self.inner.lru_store_caching.as_ref()
     }
@@ -652,32 +672,34 @@ impl DataStore {
                 .parse_property_string(config.backend.as_deref().unwrap_or(""))?,
         )?;
 
-        let lru_store_caching = if DatastoreBackendType::S3 == backend_config.ty.unwrap_or_default()
-        {
-            let mut cache_capacity = 0;
-            if let Ok(fs_info) = proxmox_sys::fs::fs_info(&chunk_store.base_path()) {
-                cache_capacity = fs_info.available / (16 * 1024 * 1024);
-            }
-            if let Some(max_cache_size) = backend_config.max_cache_size {
+        let (lru_store_caching, request_counters) =
+            if DatastoreBackendType::S3 == backend_config.ty.unwrap_or_default() {
+                let mut cache_capacity = 0;
+                if let Ok(fs_info) = proxmox_sys::fs::fs_info(&chunk_store.base_path()) {
+                    cache_capacity = fs_info.available / (16 * 1024 * 1024);
+                }
+                if let Some(max_cache_size) = backend_config.max_cache_size {
+                    info!(
+                        "Got requested max cache size {max_cache_size} for store {}",
+                        config.name
+                    );
+                    let max_cache_capacity = max_cache_size.as_u64() / (16 * 1024 * 1024);
+                    cache_capacity = cache_capacity.min(max_cache_capacity);
+                }
+                let cache_capacity = usize::try_from(cache_capacity).unwrap_or_default();
+
                 info!(
-                    "Got requested max cache size {max_cache_size} for store {}",
+                    "Using datastore cache with capacity {cache_capacity} for store {}",
                     config.name
                 );
-                let max_cache_capacity = max_cache_size.as_u64() / (16 * 1024 * 1024);
-                cache_capacity = cache_capacity.min(max_cache_capacity);
-            }
-            let cache_capacity = usize::try_from(cache_capacity).unwrap_or_default();
 
-            info!(
-                "Using datastore cache with capacity {cache_capacity} for store {}",
-                config.name
-            );
+                let cache = LocalDatastoreLruCache::new(cache_capacity, chunk_store.clone());
+                let request_counters = Self::request_counters(&config, &backend_config)?;
 
-            let cache = LocalDatastoreLruCache::new(cache_capacity, chunk_store.clone());
-            Some(cache)
-        } else {
-            None
-        };
+                (Some(cache), Some(Arc::new(request_counters)))
+            } else {
+                (None, None)
+            };
 
         let thread_settings = DatastoreThreadSettings::new(
             tuning.default_verification_workers,
@@ -695,9 +717,33 @@ impl DataStore {
             lru_store_caching,
             thread_settings,
             config_generation: generation,
+            request_counters,
         })
     }
 
+    /// Load the shared s3 request counters for given datastore and backend config
+    pub fn request_counters(
+        config: &DataStoreConfig,
+        backend_config: &DatastoreBackendConfig,
+    ) -> Result<SharedRequestCounters, Error> {
+        let path = format!(
+            "{}/{}-{}-{}.shmem",
+            S3_CLIENT_REQUEST_COUNTER_BASE_PATH,
+            backend_config
+                .client
+                .as_ref()
+                .ok_or(format_err!("missing s3 endpoint id"))?,
+            backend_config
+                .bucket
+                .as_ref()
+                .ok_or(format_err!("missing s3 bucket"))?,
+            config.name,
+        );
+        let request_counters =
+            SharedRequestCounters::open_shared_memory_mapped(path, pbs_config::backup_user()?)?;
+        Ok(request_counters)
+    }
+
     // Requires obtaining a shared chunk store lock beforehand
     pub fn create_fixed_writer<P: AsRef<Path>>(
         &self,
diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index cca340553..0033d6cf8 100644
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -623,6 +623,7 @@ pub async fn status(
     };
 
     let backend_type = datastore.backend_type();
+    let s3_statistics = datastore.s3_statistics();
 
     Ok(if store_stats {
         let storage = crate::tools::fs::fs_info(datastore.base_path()).await?;
@@ -633,6 +634,7 @@ pub async fn status(
             gc_status,
             counts,
             backend_type,
+            s3_statistics,
         }
     } else {
         DataStoreStatus {
@@ -642,6 +644,7 @@ pub async fn status(
             gc_status,
             counts,
             backend_type,
+            s3_statistics,
         }
     })
 }
-- 
2.47.3





  parent reply	other threads:[~2026-03-19  9:42 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-19  9:40 [PATCH proxmox{,-backup} v6 00/34] partially fix #6563: add s3 counter for statistics and notifications Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox v6 01/12] tree-wide: fix formatting issue via cargo fmt Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox v6 02/12] s3-client: add persistent shared request counters for client Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox v6 03/12] s3-client: add counters for upload/download traffic Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox v6 04/12] s3-client: account for upload traffic on successful request sending Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox v6 05/12] s3-client: account for downloaded bytes in incoming response body Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox v6 06/12] s3-client: request counters: periodically persist counters to file Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox v6 07/12] s3-client: sync flush request counters on client instance drop Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox v6 08/12] s3-client: api-types: define request counter thresholds Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox v6 09/12] s3-client: implement request counter threshold and exceeding callback Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox v6 10/12] pbs-api-types: define api type for s3 request statistics Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox v6 11/12] pbs-api-types: add notification thresholds to datastore config Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox v6 12/12] pbs-api-types: add reset schedule for notification threshold counters Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox-backup v6 01/22] metrics: split common module imports into individual use statements Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox-backup v6 02/22] ui: improve variable name indirectly fixing typo Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox-backup v6 03/22] notifications: template data: fix typos in docstrings Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox-backup v6 04/22] datastore: collect request statistics for s3 backed datastores Christian Ebner
2026-03-19  9:40 ` Christian Ebner [this message]
2026-03-19  9:40 ` [PATCH proxmox-backup v6 06/22] api: s3: add endpoint to reset s3 request counters Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox-backup v6 07/22] bin: s3: expose request counter reset method as cli command Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox-backup v6 08/22] ui: datastore summary: move store to be part of summary panel Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox-backup v6 09/22] ui: expose s3 request counter statistics in the datastore summary Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox-backup v6 10/22] metrics: collect s3 datastore statistics as rrd metrics Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox-backup v6 11/22] api: admin: expose s3 statistics in datastore rrd data Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox-backup v6 12/22] partially fix #6563: ui: expose s3 rrd charts in datastore summary Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox-backup v6 13/22] datastore: refactor datastore lookup parameters into dedicated type Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox-backup v6 14/22] api: config: update notification thresholds for config and counters Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox-backup v6 15/22] ui: utils: add helper to render notification threshold property string Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox-backup v6 16/22] ui: add notification thresholds edit window Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox-backup v6 17/22] notification: define templates and template data for thresholds Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox-backup v6 18/22] datastore: add thresholds notification callback on datastore lookup Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox-backup v6 19/22] api/ui: notifications: add 'thresholds' as notification type value Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox-backup v6 20/22] api: config: allow counter reset schedule editing Christian Ebner
2026-03-19  9:40 ` [PATCH proxmox-backup v6 21/22] ui: expose counter reset schedule edit window Christian Ebner
2026-03-19  9:41 ` [PATCH proxmox-backup v6 22/22] bin: proxy: periodically schedule counter reset task Christian Ebner

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=20260319094100.240765-18-c.ebner@proxmox.com \
    --to=c.ebner@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal