From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup v6 22/22] bin: proxy: periodically schedule counter reset task
Date: Thu, 19 Mar 2026 10:41:00 +0100 [thread overview]
Message-ID: <20260319094100.240765-35-c.ebner@proxmox.com> (raw)
In-Reply-To: <20260319094100.240765-1-c.ebner@proxmox.com>
Analogous to other recurring scheduled tasks, check the configured
counter reset schedule for each datastore and periodically execute
the reset task if set. By performing this as a dedicated job, it is
assured to keep track of the scheduled executions.
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
src/bin/proxmox-backup-proxy.rs | 69 ++++++++++++++++++++++++++++++++-
1 file changed, 67 insertions(+), 2 deletions(-)
diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs
index b0efa78ae..aaf2d4a6c 100644
--- a/src/bin/proxmox-backup-proxy.rs
+++ b/src/bin/proxmox-backup-proxy.rs
@@ -1,5 +1,6 @@
use std::path::{Path, PathBuf};
use std::pin::pin;
+use std::sync::atomic::Ordering;
use std::sync::{Arc, Mutex};
use anyhow::{bail, format_err, Context, Error};
@@ -40,8 +41,8 @@ use pbs_buildcfg::configdir;
use proxmox_time::CalendarEvent;
use pbs_api_types::{
- Authid, DataStoreConfig, Operation, PruneJobConfig, SyncJobConfig, TapeBackupJobConfig,
- VerificationJobConfig,
+ Authid, DataStoreConfig, DatastoreBackendConfig, Operation, PruneJobConfig, SyncJobConfig,
+ TapeBackupJobConfig, VerificationJobConfig,
};
use proxmox_backup::auth_helpers::*;
@@ -508,6 +509,7 @@ async fn schedule_tasks() -> Result<(), Error> {
schedule_datastore_verify_jobs().await;
schedule_tape_backup_jobs().await;
schedule_task_log_rotate().await;
+ schedule_notification_threshold_counter_reset().await;
Ok(())
}
@@ -881,6 +883,69 @@ async fn schedule_task_log_rotate() {
}
}
+async fn schedule_notification_threshold_counter_reset() {
+ let config = match pbs_config::datastore::config() {
+ Err(err) => {
+ eprintln!("unable to read datastore config - {err}");
+ return;
+ }
+ Ok((config, _digest)) => config,
+ };
+
+ for (store, (_, store_config)) in config.sections {
+ let store_config: DataStoreConfig = match serde_json::from_value(store_config) {
+ Ok(c) => c,
+ Err(err) => {
+ eprintln!("datastore config from_value failed - {err}");
+ continue;
+ }
+ };
+
+ let event_str = match &store_config.counter_reset_schedule {
+ Some(event_str) => event_str,
+ None => continue,
+ };
+
+ let worker_type = "notification-threshold-counter-reset";
+ if check_schedule(worker_type, event_str, &store) {
+ let mut job = match Job::new(worker_type, &store) {
+ Ok(job) => job,
+ Err(_) => continue, // could not get lock
+ };
+
+ if let Err(err) = WorkerTask::new_thread(
+ worker_type,
+ None,
+ Authid::root_auth_id().to_string(),
+ false,
+ move |worker| {
+ job.start(&worker.upid().to_string())?;
+ info!("executing counter reset for {store}");
+
+ let result = try_block!({
+ let backend_config: DatastoreBackendConfig =
+ store_config.backend.as_deref().unwrap_or("").parse()?;
+ let request_counters =
+ DataStore::request_counters(&store_config, &backend_config)?;
+ request_counters.reset(Ordering::Release);
+ Ok(())
+ });
+
+ let status = worker.create_state(&result);
+
+ if let Err(err) = job.finish(status) {
+ eprintln!("could not finish job state for {worker_type}: {err}");
+ }
+
+ result
+ },
+ ) {
+ eprintln!("unable to start counter reset task: {err}");
+ }
+ }
+ }
+}
+
async fn command_reopen_access_logfiles() -> Result<(), Error> {
// only care about the most recent daemon instance for each, proxy & api, as other older ones
// should not respond to new requests anyway, but only finish their current one and then exit.
--
2.47.3
prev parent reply other threads:[~2026-03-19 9:41 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 ` [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 ` Christian Ebner [this message]
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-35-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