From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup v5 14/20] api: config: update notification thresholds for config and counters
Date: Wed, 11 Mar 2026 14:08:17 +0100 [thread overview]
Message-ID: <20260311130823.724888-28-c.ebner@proxmox.com> (raw)
In-Reply-To: <20260311130823.724888-1-c.ebner@proxmox.com>
Allow users to update or clear notification threshold values stored
in the datastore configuration via api or cli.
At the same time, also load and update the threshold values for the
shared request counters so they are applied immediately.
To achieve this without duplicating code, move the request counter
loading and updating of the thresholds into dedicated helpers.
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
pbs-datastore/src/datastore.rs | 27 ++++++++++++++++++++++++---
src/api2/config/datastore.rs | 33 +++++++++++++++++++++++++++++----
2 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
index a2b2f182b..d60609124 100644
--- a/pbs-datastore/src/datastore.rs
+++ b/pbs-datastore/src/datastore.rs
@@ -19,8 +19,8 @@ use tracing::{info, warn};
use proxmox_human_byte::HumanByte;
use proxmox_s3_client::{
- S3Client, S3ClientConf, S3ClientOptions, S3ObjectKey, S3PathPrefix, S3RateLimiterOptions,
- S3RequestCounterOptions, SharedRequestCounters,
+ RequestCounterThresholds, S3Client, S3ClientConf, S3ClientOptions, S3ObjectKey, S3PathPrefix,
+ S3RateLimiterOptions, S3RequestCounterOptions, SharedRequestCounters,
};
use proxmox_schema::ApiType;
@@ -729,7 +729,10 @@ impl DataStore {
);
let cache = LocalDatastoreLruCache::new(cache_capacity, chunk_store.clone());
- let request_counters = Self::request_counters(&config, &backend_config)?;
+
+ let mut request_counters = Self::request_counters(&config, &backend_config)?;
+
+ Self::update_notification_thresholds(&mut request_counters, &config)?;
(Some(cache), Some(Arc::new(request_counters)))
} else {
@@ -779,6 +782,24 @@ impl DataStore {
Ok(request_counters)
}
+ /// Update the notification threshold values on the counters by given config
+ pub fn update_notification_thresholds(
+ counters: &mut SharedRequestCounters,
+ config: &DataStoreConfig,
+ ) -> Result<(), Error> {
+ let thresholds: RequestCounterThresholds =
+ if let Some(thresholds) = &config.notification_thresholds {
+ serde_json::from_value(
+ RequestCounterThresholds::API_SCHEMA.parse_property_string(thresholds)?,
+ )?
+ } else {
+ RequestCounterThresholds::default()
+ };
+
+ counters.update_thresholds(&thresholds);
+ Ok(())
+ }
+
// Requires obtaining a shared chunk store lock beforehand
pub fn create_fixed_writer<P: AsRef<Path>>(
&self,
diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs
index 45a251851..6f9920714 100644
--- a/src/api2/config/datastore.rs
+++ b/src/api2/config/datastore.rs
@@ -14,10 +14,11 @@ use proxmox_section_config::SectionConfigData;
use proxmox_uuid::Uuid;
use pbs_api_types::{
- Authid, DataStoreConfig, DataStoreConfigUpdater, DatastoreBackendType, DatastoreNotify,
- DatastoreTuning, KeepOptions, MaintenanceMode, MaintenanceType, PruneJobConfig,
- PruneJobOptions, DATASTORE_SCHEMA, PRIV_DATASTORE_ALLOCATE, PRIV_DATASTORE_AUDIT,
- PRIV_DATASTORE_MODIFY, PRIV_SYS_MODIFY, PROXMOX_CONFIG_DIGEST_SCHEMA, UPID_SCHEMA,
+ Authid, DataStoreConfig, DataStoreConfigUpdater, DatastoreBackendConfig, DatastoreBackendType,
+ DatastoreNotify, DatastoreTuning, KeepOptions, MaintenanceMode, MaintenanceType,
+ PruneJobConfig, PruneJobOptions, DATASTORE_SCHEMA, PRIV_DATASTORE_ALLOCATE,
+ PRIV_DATASTORE_AUDIT, PRIV_DATASTORE_MODIFY, PRIV_SYS_MODIFY, PROXMOX_CONFIG_DIGEST_SCHEMA,
+ UPID_SCHEMA,
};
use pbs_config::BackupLockGuard;
use pbs_datastore::chunk_store::ChunkStore;
@@ -442,6 +443,8 @@ pub enum DeletableProperty {
Tuning,
/// Delete the maintenance-mode property
MaintenanceMode,
+ /// Delete the notification-thresholds property
+ NotificationThresholds,
}
#[api(
@@ -540,6 +543,10 @@ pub fn update_datastore(
DeletableProperty::MaintenanceMode => {
data.set_maintenance_mode(None)?;
}
+ DeletableProperty::NotificationThresholds => {
+ data.notification_thresholds = None;
+ update_thresholds(&data)?;
+ }
}
}
}
@@ -625,6 +632,11 @@ pub fn update_datastore(
data.set_maintenance_mode(maintenance_mode)?;
}
+ if update.notification_thresholds.is_some() {
+ data.notification_thresholds = update.notification_thresholds;
+ update_thresholds(&data)?;
+ }
+
config.set_data(&name, "datastore", &data)?;
pbs_config::datastore::save_config(&config)?;
@@ -657,6 +669,19 @@ pub fn update_datastore(
Ok(())
}
+fn update_thresholds(config: &DataStoreConfig) -> Result<(), Error> {
+ let backend_config: DatastoreBackendConfig = serde_json::from_value(
+ DatastoreBackendConfig::API_SCHEMA
+ .parse_property_string(config.backend.as_deref().unwrap_or(""))?,
+ )?;
+ if backend_config.ty.unwrap_or_default() == DatastoreBackendType::S3 {
+ let mut request_counters =
+ pbs_datastore::DataStore::request_counters(config, &backend_config)?;
+ pbs_datastore::DataStore::update_notification_thresholds(&mut request_counters, config)?;
+ }
+ Ok(())
+}
+
#[api(
protected: true,
input: {
--
2.47.3
next prev parent reply other threads:[~2026-03-11 13:09 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-11 13:07 [PATCH proxmox{,-backup} v5 00/33] partially fix #6563: add s3 request and traffic counter statistics Christian Ebner
2026-03-11 13:07 ` [PATCH proxmox v5 01/13] proxmox-sys: expose msync to flush mmapped contents to filesystem Christian Ebner
2026-03-12 11:20 ` applied: " Fabian Grünbichler
2026-03-11 13:07 ` [PATCH proxmox v5 02/13] shared-memory: add method without tmpfs check for mmap file location Christian Ebner
2026-03-12 11:20 ` applied: " Fabian Grünbichler
2026-03-11 13:07 ` [PATCH proxmox v5 03/13] shared-memory: expose msync to flush in-memory contents to filesystem Christian Ebner
2026-03-12 11:20 ` applied: " Fabian Grünbichler
2026-03-11 13:07 ` [PATCH proxmox v5 04/13] s3-client: add persistent shared request counters for client Christian Ebner
2026-03-11 13:07 ` [PATCH proxmox v5 05/13] s3-client: add counters for upload/download traffic Christian Ebner
2026-03-12 14:28 ` Hannes Laimer
2026-03-12 14:40 ` Christian Ebner
2026-03-11 13:07 ` [PATCH proxmox v5 06/13] s3-client: account for upload traffic on successful request sending Christian Ebner
2026-03-11 13:07 ` [PATCH proxmox v5 07/13] s3-client: account for downloaded bytes in incoming response body Christian Ebner
2026-03-12 14:14 ` Hannes Laimer
2026-03-12 14:42 ` Christian Ebner
2026-03-11 13:07 ` [PATCH proxmox v5 08/13] s3-client: request counters: periodically persist counters to file Christian Ebner
2026-03-13 14:16 ` Hannes Laimer
2026-03-11 13:07 ` [PATCH proxmox v5 09/13] s3-client: sync flush request counters on client instance drop Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox v5 10/13] pbs-api-types: define api type for s3 request statistics Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox v5 11/13] s3-client: api-types: define request counter thresholds Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox v5 12/13] pbs-api-types: add notification thresholds to datastore config Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox v5 13/13] s3-client: implement request counter threshold and exceeding callback Christian Ebner
2026-03-12 14:11 ` Hannes Laimer
2026-03-13 14:27 ` Hannes Laimer
2026-03-13 14:56 ` Christian Ebner
2026-03-16 10:36 ` Hannes Laimer
2026-03-16 10:38 ` Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 01/20] metrics: split common module imports into individual use statements Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 02/20] datastore: collect request statistics for s3 backed datastores Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 03/20] datastore: expose request counters " Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 04/20] api: s3: add endpoint to reset s3 request counters Christian Ebner
2026-03-12 14:08 ` Hannes Laimer
2026-03-12 14:43 ` Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 05/20] bin: s3: expose request counter reset method as cli command Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 06/20] datastore: add helper method to get datastore backend type Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 07/20] ui: improve variable name indirectly fixing typo Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 08/20] ui: datastore summary: move store to be part of summary panel Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 09/20] ui: expose s3 request counter statistics in the datastore summary Christian Ebner
2026-03-16 14:02 ` Hannes Laimer
2026-03-11 13:08 ` [PATCH proxmox-backup v5 10/20] metrics: collect s3 datastore statistics as rrd metrics Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 11/20] api: admin: expose s3 statistics in datastore rrd data Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 12/20] partially fix #6563: ui: expose s3 rrd charts in datastore summary Christian Ebner
2026-03-13 14:45 ` Hannes Laimer
2026-03-11 13:08 ` [PATCH proxmox-backup v5 13/20] datastore: refactor shared request counter loading into helper Christian Ebner
2026-03-11 13:08 ` Christian Ebner [this message]
2026-03-11 13:08 ` [PATCH proxmox-backup v5 15/20] ui: utils: add helper to render notification threshold property string Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 16/20] ui: add notification thresholds edit window Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 17/20] notifications: template data: fix typos in docstrings Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 18/20] notification: define templates and template data for thresholds Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 19/20] datastore: add thresholds notification callback on datastore lookup Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 20/20] api/ui: notifications: add 'thresholds' as notification type value Christian Ebner
2026-03-16 14:04 ` [PATCH proxmox{,-backup} v5 00/33] partially fix #6563: add s3 request and traffic counter statistics Hannes Laimer
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=20260311130823.724888-28-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