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 v4 13/13] s3-client: implement request counter threshold and exceeding callback
Date: Tue,  3 Mar 2026 16:22:55 +0100	[thread overview]
Message-ID: <20260303152317.934256-14-c.ebner@proxmox.com> (raw)
In-Reply-To: <20260303152317.934256-1-c.ebner@proxmox.com>

Allows to set the threshold values to trigger exceeding callbacks
for the s3 request counters.
The globally settable callback function is executed whenever one of
the request counters is exceeding it's set threshold value, but
only once when passing over the threshold.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
 .../src/shared_request_counters.rs            | 131 ++++++++++++++++--
 1 file changed, 123 insertions(+), 8 deletions(-)

diff --git a/proxmox-s3-client/src/shared_request_counters.rs b/proxmox-s3-client/src/shared_request_counters.rs
index 0c668183..228da051 100644
--- a/proxmox-s3-client/src/shared_request_counters.rs
+++ b/proxmox-s3-client/src/shared_request_counters.rs
@@ -2,7 +2,7 @@ use std::collections::HashMap;
 use std::mem::MaybeUninit;
 use std::path::{Path, PathBuf};
 use std::sync::atomic::{AtomicU64, Ordering};
-use std::sync::{Arc, RwLock};
+use std::sync::{Arc, LazyLock, RwLock};
 use std::time::Duration;
 
 use anyhow::{bail, Error};
@@ -18,10 +18,18 @@ use tokio::time::Instant;
 use proxmox_shared_memory::{Init, SharedMemory};
 use proxmox_sys::fs::CreateOptions;
 
+use crate::api_types::RequestCounterThresholds;
+
 const MEMORY_PAGE_SIZE: usize = 4096;
 /// Generated via openssl::sha::sha256(b"Proxmox shared request counters v1.0")[0..8]
 const PROXMOX_SHARED_REQUEST_COUNTERS_1_0: [u8; 8] = [224, 110, 88, 252, 26, 77, 180, 5];
 
+/// Callback method triggered when exceeding counter thresholds.
+pub type ThresholdExceededCallback = Box<dyn Fn(&str, u64, u64) + Send + Sync + 'static>;
+static SHARED_COUNTER_THRESHOLD_EXCEEDED_CALLBACK: LazyLock<
+    RwLock<Option<ThresholdExceededCallback>>,
+> = LazyLock::new(|| RwLock::new(None));
+
 #[repr(C, align(32))]
 #[derive(Default)]
 /// AtomicU64 aligned to the half default cache line size of 64-bytes.
@@ -48,6 +56,16 @@ struct RequestCounters {
     // traffic in bytes
     upload: AlignedAtomic,
     download: AlignedAtomic,
+
+    /// Request counter thresholds
+    get_threshold: AlignedAtomic,
+    delete_threshold: AlignedAtomic,
+    put_threshold: AlignedAtomic,
+    head_threshold: AlignedAtomic,
+    post_threshold: AlignedAtomic,
+    // Traffic counter thresholds
+    upload_threshold: AlignedAtomic,
+    download_threshold: AlignedAtomic,
 }
 
 impl Init for RequestCounters {
@@ -63,15 +81,49 @@ impl RequestCounters {
     /// Returns the previously stored value.
     pub fn increment(&self, method: Method, ordering: Ordering) -> u64 {
         match method {
-            Method::DELETE => self.delete.0.fetch_add(1, ordering),
-            Method::GET => self.get.0.fetch_add(1, ordering),
-            Method::HEAD => self.head.0.fetch_add(1, ordering),
-            Method::POST => self.post.0.fetch_add(1, ordering),
-            Method::PUT => self.put.0.fetch_add(1, ordering),
+            Method::DELETE => {
+                let prev = self.delete.0.fetch_add(1, ordering);
+                let threshold = self.delete_threshold.0.load(Ordering::Acquire);
+                Self::check_threshold(method.as_str(), threshold, prev + 1);
+                prev
+            }
+            Method::GET => {
+                let prev = self.get.0.fetch_add(1, ordering);
+                let threshold = self.get_threshold.0.load(Ordering::Acquire);
+                Self::check_threshold(method.as_str(), threshold, prev + 1);
+                prev
+            }
+            Method::HEAD => {
+                let prev = self.head.0.fetch_add(1, ordering);
+                let threshold = self.head_threshold.0.load(Ordering::Acquire);
+                Self::check_threshold(method.as_str(), threshold, prev + 1);
+                prev
+            }
+            Method::POST => {
+                let prev = self.post.0.fetch_add(1, ordering);
+                let threshold = self.post_threshold.0.load(Ordering::Acquire);
+                Self::check_threshold(method.as_str(), threshold, prev + 1);
+                prev
+            }
+            Method::PUT => {
+                let prev = self.put.0.fetch_add(1, ordering);
+                let threshold = self.put_threshold.0.load(Ordering::Acquire);
+                Self::check_threshold(method.as_str(), threshold, prev + 1);
+                prev
+            }
             _ => 0,
         }
     }
 
+    fn check_threshold(counter_id: &str, threshold: u64, current: u64) {
+        if threshold > 0 && current > threshold && current - 1 == threshold {
+            let guard = SHARED_COUNTER_THRESHOLD_EXCEEDED_CALLBACK.read().unwrap();
+            if let Some(callback) = guard.as_ref() {
+                callback(counter_id, threshold, current);
+            }
+        }
+    }
+
     /// Load current counter state for given method, following the provided memory ordering constrains
     pub fn load(&self, method: Method, ordering: Ordering) -> u64 {
         match method {
@@ -97,7 +149,16 @@ impl RequestCounters {
     ///
     /// Returns the previously stored value.
     pub fn add_upload_traffic(&self, count: u64, ordering: Ordering) -> u64 {
-        self.upload.0.fetch_add(count, ordering)
+        let prev = self.upload.0.fetch_add(count, ordering);
+        let threshold = self.upload_threshold.0.load(Ordering::Acquire);
+        let uploaded = prev + count;
+        if threshold > 0 && uploaded > threshold && prev <= threshold {
+            let guard = SHARED_COUNTER_THRESHOLD_EXCEEDED_CALLBACK.read().unwrap();
+            if let Some(callback) = guard.as_ref() {
+                callback("uploaded", threshold, uploaded);
+            }
+        }
+        prev
     }
 
     /// Returns upload traffic count.
@@ -109,13 +170,51 @@ impl RequestCounters {
     ///
     /// Returns the previously stored value.
     pub fn add_download_traffic(&self, count: u64, ordering: Ordering) -> u64 {
-        self.download.0.fetch_add(count, ordering)
+        let prev = self.download.0.fetch_add(count, ordering);
+        let threshold = self.upload_threshold.0.load(Ordering::Acquire);
+        let downloaded = prev + count;
+        if threshold > 0 && downloaded > threshold && prev <= threshold {
+            let guard = SHARED_COUNTER_THRESHOLD_EXCEEDED_CALLBACK.read().unwrap();
+            if let Some(callback) = guard.as_ref() {
+                callback("downloaded", threshold, downloaded);
+            }
+        }
+        prev
     }
 
     /// Returns download traffic count.
     pub fn get_download_traffic(&self, ordering: Ordering) -> u64 {
         self.download.0.load(ordering)
     }
+
+    /// Update the request threshold values.
+    pub fn update_thresholds(&self, thresholds: &RequestCounterThresholds) {
+        self.delete_threshold
+            .0
+            .store(thresholds.s3_delete.unwrap_or(0), Ordering::Release);
+        self.get_threshold
+            .0
+            .store(thresholds.s3_get.unwrap_or(0), Ordering::Release);
+        self.head_threshold
+            .0
+            .store(thresholds.s3_head.unwrap_or(0), Ordering::Release);
+        self.post_threshold
+            .0
+            .store(thresholds.s3_post.unwrap_or(0), Ordering::Release);
+        self.put_threshold
+            .0
+            .store(thresholds.s3_put.unwrap_or(0), Ordering::Release);
+        let download = thresholds
+            .s3_download
+            .map(|human_byte| human_byte.as_u64())
+            .unwrap_or(0);
+        self.download_threshold.0.store(download, Ordering::Release);
+        let upload = thresholds
+            .s3_upload
+            .map(|human_byte| human_byte.as_u64())
+            .unwrap_or(0);
+        self.upload_threshold.0.store(upload, Ordering::Release);
+    }
 }
 
 /// Size of the padding to align the mmapped request counters to 4k default
@@ -270,6 +369,22 @@ impl SharedRequestCounters {
     pub fn path_buf(&self) -> PathBuf {
         self.path.clone()
     }
+
+    /// Update the callback executed when one of the set thresholds is exceeded
+    pub fn update_thresholds_exceeded_callback(callback: ThresholdExceededCallback) {
+        SHARED_COUNTER_THRESHOLD_EXCEEDED_CALLBACK
+            .write()
+            .unwrap()
+            .replace(callback);
+    }
+
+    /// Update the request counter thresholds to given values.
+    pub fn update_thresholds(&self, thresholds: &RequestCounterThresholds) {
+        self.shared_memory
+            .data()
+            .counters
+            .update_thresholds(thresholds);
+    }
 }
 
 const FLUSH_THRESHOLD: Duration = Duration::from_secs(5);
-- 
2.47.3





  parent reply	other threads:[~2026-03-03 15:23 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-03 15:22 [PATCH proxmox{,-backup} v4 00/35] partially fix #6563: add s3 request and traffic counter statistics Christian Ebner
2026-03-03 15:22 ` [PATCH proxmox v4 01/13] proxmox-sys: expose msync to flush mmapped contents to filesystem Christian Ebner
2026-03-03 15:22 ` [PATCH proxmox v4 02/13] shared-memory: add method without tmpfs check for mmap file location Christian Ebner
2026-03-03 15:22 ` [PATCH proxmox v4 03/13] shared-memory: expose msync to flush in-memory contents to filesystem Christian Ebner
2026-03-03 15:22 ` [PATCH proxmox v4 04/13] s3-client: add persistent shared request counters for client Christian Ebner
2026-03-03 15:22 ` [PATCH proxmox v4 05/13] s3-client: add counters for upload/download traffic Christian Ebner
2026-03-03 15:22 ` [PATCH proxmox v4 06/13] s3-client: account for upload traffic on successful request sending Christian Ebner
2026-03-03 15:22 ` [PATCH proxmox v4 07/13] s3-client: account for downloaded bytes in incoming response body Christian Ebner
2026-03-03 15:22 ` [PATCH proxmox v4 08/13] s3-client: request counters: periodically persist counters to file Christian Ebner
2026-03-03 15:22 ` [PATCH proxmox v4 09/13] s3-client: sync flush request counters on client instance drop Christian Ebner
2026-03-03 15:22 ` [PATCH proxmox v4 10/13] pbs-api-types: define api type for s3 request statistics Christian Ebner
2026-03-03 15:22 ` [PATCH proxmox v4 11/13] s3-client: api-types: define request counter thresholds Christian Ebner
2026-03-03 15:22 ` [PATCH proxmox v4 12/13] pbs-api-types: add notification thresholds to datastore config Christian Ebner
2026-03-03 15:22 ` Christian Ebner [this message]
2026-03-03 15:22 ` [PATCH proxmox-backup v4 01/22] metrics: split common module imports into individual use statements Christian Ebner
2026-03-03 15:22 ` [PATCH proxmox-backup v4 02/22] datastore: collect request statistics for s3 backed datastores Christian Ebner
2026-03-03 15:22 ` [PATCH proxmox-backup v4 03/22] datastore: expose request counters " Christian Ebner
2026-03-03 15:22 ` [PATCH proxmox-backup v4 04/22] api: s3: add endpoint to reset s3 request counters Christian Ebner
2026-03-03 15:23 ` [PATCH proxmox-backup v4 05/22] bin: s3: expose request counter reset method as cli command Christian Ebner
2026-03-03 15:23 ` [PATCH proxmox-backup v4 06/22] datastore: add helper method to get datastore backend type Christian Ebner
2026-03-03 15:23 ` [PATCH proxmox-backup v4 07/22] ui: improve variable name indirectly fixing typo Christian Ebner
2026-03-03 15:23 ` [PATCH proxmox-backup v4 08/22] ui: datastore summary: move store to be part of summary panel Christian Ebner
2026-03-03 15:23 ` [PATCH proxmox-backup v4 09/22] ui: expose s3 request counter statistics in the datastore summary Christian Ebner
2026-03-03 15:23 ` [PATCH proxmox-backup v4 10/22] metrics: collect s3 datastore statistics as rrd metrics Christian Ebner
2026-03-03 15:23 ` [PATCH proxmox-backup v4 11/22] api: admin: expose s3 statistics in datastore rrd data Christian Ebner
2026-03-03 15:23 ` [PATCH proxmox-backup v4 12/22] partially fix #6563: ui: expose s3 rrd charts in datastore summary Christian Ebner
2026-03-03 15:23 ` [PATCH proxmox-backup v4 13/22] datastore: make operation non-optional in lookups Christian Ebner
2026-03-03 15:23 ` [PATCH proxmox-backup v4 14/22] datastore: refactor datastore lookup parameters into dedicated type Christian Ebner
2026-03-03 15:23 ` [PATCH proxmox-backup v4 15/22] datastore: refactor shared request counter loading into helper Christian Ebner
2026-03-03 15:23 ` [PATCH proxmox-backup v4 16/22] api: config: update notification thresholds for config and counters Christian Ebner
2026-03-03 15:23 ` [PATCH proxmox-backup v4 17/22] ui: utils: add helper to render notification threshold property string Christian Ebner
2026-03-03 15:23 ` [PATCH proxmox-backup v4 18/22] ui: add notification thresholds edit window Christian Ebner
2026-03-03 15:23 ` [PATCH proxmox-backup v4 19/22] notifications: template data: fix typos in docstrings Christian Ebner
2026-03-03 15:23 ` [PATCH proxmox-backup v4 20/22] notification: define templates and template data for thresholds Christian Ebner
2026-03-03 15:23 ` [PATCH proxmox-backup v4 21/22] datastore: add thresholds notification callback on datastore lookup Christian Ebner
2026-03-03 15:23 ` [PATCH proxmox-backup v4 22/22] api/ui: notifications: add 'thresholds' as notification type value 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=20260303152317.934256-14-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