From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup v6 18/22] datastore: add thresholds notification callback on datastore lookup
Date: Thu, 19 Mar 2026 10:40:56 +0100 [thread overview]
Message-ID: <20260319094100.240765-31-c.ebner@proxmox.com> (raw)
In-Reply-To: <20260319094100.240765-1-c.ebner@proxmox.com>
Pass in the callback to be executed when a datastore threshold value
exceeds its set limit. This callback is then callable by the s3
client request counters implementation, currently the only component
defining thresholds.
When a threshold is exceeded, the notification is generated by the
callback and queued for being send.
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
pbs-datastore/src/datastore.rs | 36 ++++++++++++++++++++++++----
pbs-datastore/src/snapshot_reader.rs | 1 +
src/tools/mod.rs | 9 ++++++-
3 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
index 379cf8b73..ec0ffd713 100644
--- a/pbs-datastore/src/datastore.rs
+++ b/pbs-datastore/src/datastore.rs
@@ -202,14 +202,25 @@ impl DataStoreImpl {
}
}
+pub type ThresholdsExceededCallback = fn(&str, &str, u64, u64) -> Result<(), Error>;
+
pub struct DataStoreLookup<'a> {
name: &'a str,
operation: Operation,
+ thresholds_exceeded_callback: Arc<Option<ThresholdsExceededCallback>>,
}
impl<'a> DataStoreLookup<'a> {
- pub fn with(name: &'a str, operation: Operation) -> Self {
- Self { name, operation }
+ pub fn with(
+ name: &'a str,
+ operation: Operation,
+ thresholds_exceeded_callback: Arc<Option<ThresholdsExceededCallback>>,
+ ) -> Self {
+ Self {
+ name,
+ operation,
+ thresholds_exceeded_callback,
+ }
}
}
@@ -556,7 +567,12 @@ impl DataStore {
)?)
};
- let datastore = DataStore::with_store_and_config(chunk_store, config, gen_num)?;
+ let datastore = DataStore::with_store_and_config(
+ chunk_store,
+ config,
+ gen_num,
+ Arc::clone(&lookup.thresholds_exceeded_callback),
+ )?;
let datastore = Arc::new(datastore);
datastore_cache.insert(lookup.name.to_string(), datastore.clone());
@@ -591,7 +607,7 @@ impl DataStore {
{
// the datastore drop handler does the checking if tasks are running and clears the
// cache entry, so we just have to trigger it here
- let lookup = DataStoreLookup::with(name, Operation::Lookup);
+ let lookup = DataStoreLookup::with(name, Operation::Lookup, Arc::new(None));
let _ = DataStore::lookup_datastore(lookup);
}
@@ -645,6 +661,7 @@ impl DataStore {
Arc::new(chunk_store),
config,
None,
+ Arc::new(None),
)?);
if let Some(operation) = operation {
@@ -658,6 +675,7 @@ impl DataStore {
chunk_store: Arc<ChunkStore>,
config: DataStoreConfig,
generation: Option<usize>,
+ thresholds_exceeded_callback: Arc<Option<ThresholdsExceededCallback>>,
) -> Result<DataStoreImpl, Error> {
let mut gc_status_path = chunk_store.base_path();
gc_status_path.push(".gc-status");
@@ -710,6 +728,16 @@ impl DataStore {
let mut request_counters = Self::request_counters(&config, &backend_config)?;
Self::update_notification_thresholds(&mut request_counters, &config)?;
+ request_counters.set_thresholds_exceeded_callback(
+ config.name,
+ Box::new(move |label, counter_id, threshold, value| {
+ thresholds_exceeded_callback.map(|cb| {
+ if let Err(err) = cb(label, counter_id, threshold, value) {
+ log::error!("failed to send notification: {err:?}");
+ }
+ });
+ }),
+ );
(Some(cache), Some(Arc::new(request_counters)))
} else {
diff --git a/pbs-datastore/src/snapshot_reader.rs b/pbs-datastore/src/snapshot_reader.rs
index d522a02d7..2c8f19c17 100644
--- a/pbs-datastore/src/snapshot_reader.rs
+++ b/pbs-datastore/src/snapshot_reader.rs
@@ -166,6 +166,7 @@ impl<F: Fn(&[u8; 32]) -> bool> Iterator for SnapshotChunkIterator<'_, F> {
let lookup = DataStoreLookup::with(
self.snapshot_reader.datastore_name(),
Operation::Read,
+ Arc::new(None),
);
let datastore = DataStore::lookup_datastore(lookup)?;
let order =
diff --git a/src/tools/mod.rs b/src/tools/mod.rs
index a82aaf136..2dfbac885 100644
--- a/src/tools/mod.rs
+++ b/src/tools/mod.rs
@@ -4,6 +4,7 @@
use anyhow::{bail, Error};
use std::collections::HashSet;
+use std::sync::Arc;
use pbs_api_types::{
Authid, BackupContent, CryptMode, Operation, SnapshotListItem, SnapshotVerifyState,
@@ -192,5 +193,11 @@ pub(crate) fn backup_info_to_snapshot_list_item(
/// Lookup the datastore by name with given operation.
#[inline(always)]
pub fn lookup_with<'a>(name: &'a str, operation: Operation) -> DataStoreLookup<'a> {
- DataStoreLookup::with(name, operation)
+ DataStoreLookup::with(
+ name,
+ operation,
+ Arc::new(Some(
+ crate::server::notifications::send_datastore_threshold_exceeded,
+ )),
+ )
}
--
2.47.3
next prev 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 ` [PATCH proxmox-backup v6 05/22] datastore: expose request counters " Christian Ebner
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 ` Christian Ebner [this message]
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-31-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox