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 v7 17/34] api: s3: add endpoint to reset s3 request counters
Date: Wed,  1 Apr 2026 15:48:00 +0200	[thread overview]
Message-ID: <20260401134817.926499-18-c.ebner@proxmox.com> (raw)
In-Reply-To: <20260401134817.926499-1-c.ebner@proxmox.com>

Allows to manually reset the current counter states via the api, in
order to provide the same functionality also via a dedicated cli
command. Regular operation will however be to reset the counters
via a scheduled task, as introduced subsequently.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
Reviewed-by: Hannes Laimer <h.laimer@proxmox.com>
Tested-by: Hannes Laimer <h.laimer@proxmox.com>
---
 src/api2/admin/s3.rs | 71 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 68 insertions(+), 3 deletions(-)

diff --git a/src/api2/admin/s3.rs b/src/api2/admin/s3.rs
index 1e098b4a1..174e8bfe7 100644
--- a/src/api2/admin/s3.rs
+++ b/src/api2/admin/s3.rs
@@ -1,13 +1,16 @@
 //! S3 bucket operations
 
-use anyhow::{Context, Error};
+use std::path::Path;
+use std::sync::atomic::Ordering;
+
+use anyhow::{bail, Context, Error};
 use serde_json::Value;
 
 use proxmox_http::Body;
 use proxmox_router::{list_subdirs_api_method, Permission, Router, RpcEnvironment, SubdirMap};
 use proxmox_s3_client::{
     S3Client, S3ClientConf, S3ClientOptions, S3ObjectKey, S3RequestCounterConfig,
-    S3_BUCKET_NAME_SCHEMA, S3_CLIENT_ID_SCHEMA, S3_HTTP_REQUEST_TIMEOUT,
+    SharedRequestCounters, S3_BUCKET_NAME_SCHEMA, S3_CLIENT_ID_SCHEMA, S3_HTTP_REQUEST_TIMEOUT,
 };
 use proxmox_schema::*;
 use proxmox_sortable_macro::sortable;
@@ -96,8 +99,70 @@ pub async fn check(
     Ok(Value::Null)
 }
 
+#[api(
+    input: {
+        properties: {
+            "s3-client-id": {
+                schema: S3_CLIENT_ID_SCHEMA,
+            },
+            bucket: {
+                schema: S3_BUCKET_NAME_SCHEMA,
+            },
+            "store-prefix": {
+                type: String,
+                description: "Store prefix within bucket for S3 object keys (commonly datastore name)",
+                optional: true,
+            },
+        },
+    },
+    access: {
+        permission: &Permission::Privilege(&[], PRIV_SYS_MODIFY, false),
+    },
+)]
+/// Reset the S3 request counters for matching endpoint, bucket or datastore (if prefix is given).
+pub async fn reset_counters(
+    s3_client_id: String,
+    bucket: String,
+    store_prefix: Option<String>,
+    _rpcenv: &mut dyn RpcEnvironment,
+) -> Result<(), Error> {
+    let (config, _digest) = pbs_config::s3::config()?;
+    // only check if the provided endpoint id exists
+    let _config: S3ClientConf = config
+        .lookup(S3_CFG_TYPE_ID, &s3_client_id)
+        .context("config lookup failed")?;
+
+    let request_counter_id = if let Some(store) = &store_prefix {
+        format!("{s3_client_id}-{bucket}-{store}")
+    } else {
+        format!("{s3_client_id}-{bucket}")
+    };
+
+    let path = format!("{S3_CLIENT_REQUEST_COUNTER_BASE_PATH}/{request_counter_id}.shmem");
+    let path = Path::new(&path);
+    // Fail early to not create the file when opening shared memory map below. Accept that
+    // this can race, with a new counter file being created in the mean time, but that is
+    // not an issue.
+    if !path.is_file() {
+        bail!("Cannot find s3 counters file '{path:?}'");
+    }
+
+    let user = pbs_config::backup_user()?;
+    let request_counters = SharedRequestCounters::open_shared_memory_mapped(path, user)
+        .context("failed to open shared request counters")?;
+    request_counters.reset(Ordering::Release);
+
+    Ok(())
+}
+
 #[sortable]
-const S3_OPERATION_SUBDIRS: SubdirMap = &[("check", &Router::new().put(&API_METHOD_CHECK))];
+const S3_OPERATION_SUBDIRS: SubdirMap = &[
+    ("check", &Router::new().put(&API_METHOD_CHECK)),
+    (
+        "reset-counters",
+        &Router::new().put(&API_METHOD_RESET_COUNTERS),
+    ),
+];
 
 const S3_OPERATION_ROUTER: Router = Router::new()
     .get(&list_subdirs_api_method!(S3_OPERATION_SUBDIRS))
-- 
2.47.3





  parent reply	other threads:[~2026-04-01 13:48 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-04-01 13:47 [PATCH proxmox{,-backup} v7 00/34] partially fix #6563: add s3 counter for statistics and notifications Christian Ebner
2026-04-01 13:47 ` [PATCH proxmox v7 01/34] s3-client: add persistent shared request counters for client Christian Ebner
2026-04-01 13:47 ` [PATCH proxmox v7 02/34] s3-client: add counters for upload/download traffic Christian Ebner
2026-04-01 13:47 ` [PATCH proxmox v7 03/34] s3-client: account for upload traffic on successful request sending Christian Ebner
2026-04-01 13:47 ` [PATCH proxmox v7 04/34] s3-client: account for downloaded bytes in incoming response body Christian Ebner
2026-04-01 13:47 ` [PATCH proxmox v7 05/34] s3-client: request counters: periodically persist counters to file Christian Ebner
2026-04-01 13:47 ` [PATCH proxmox v7 06/34] s3-client: sync flush request counters on client instance drop Christian Ebner
2026-04-01 13:47 ` [PATCH proxmox v7 07/34] s3-client: api-types: define request counter thresholds Christian Ebner
2026-04-01 13:47 ` [PATCH proxmox v7 08/34] s3-client: implement request counter threshold and exceeding callback Christian Ebner
2026-04-01 13:47 ` [PATCH proxmox v7 09/34] pbs-api-types: define api type for s3 request statistics Christian Ebner
2026-04-01 13:47 ` [PATCH proxmox v7 10/34] pbs-api-types: add notification thresholds to datastore config Christian Ebner
2026-04-01 13:47 ` [PATCH proxmox v7 11/34] pbs-api-types: add reset schedule for notification threshold counters Christian Ebner
2026-04-01 13:47 ` [PATCH proxmox-backup v7 12/34] metrics: split common module imports into individual use statements Christian Ebner
2026-04-01 13:47 ` [PATCH proxmox-backup v7 13/34] ui: improve variable name indirectly fixing typo Christian Ebner
2026-04-01 13:47 ` [PATCH proxmox-backup v7 14/34] notifications: template data: fix typos in docstrings Christian Ebner
2026-04-01 13:47 ` [PATCH proxmox-backup v7 15/34] datastore: collect request statistics for s3 backed datastores Christian Ebner
2026-04-01 13:47 ` [PATCH proxmox-backup v7 16/34] datastore: expose request counters " Christian Ebner
2026-04-01 13:48 ` Christian Ebner [this message]
2026-04-01 13:48 ` [PATCH proxmox-backup v7 18/34] bin: s3: expose request counter reset method as cli command Christian Ebner
2026-04-01 13:48 ` [PATCH proxmox-backup v7 19/34] ui: datastore summary: move store to be part of summary panel Christian Ebner
2026-04-01 13:48 ` [PATCH proxmox-backup v7 20/34] ui: expose s3 request counter statistics in the datastore summary Christian Ebner
2026-04-01 13:48 ` [PATCH proxmox-backup v7 21/34] metrics: collect s3 datastore statistics as rrd metrics Christian Ebner
2026-04-01 13:48 ` [PATCH proxmox-backup v7 22/34] api: admin: expose s3 statistics in datastore rrd data Christian Ebner
2026-04-01 13:48 ` [PATCH proxmox-backup v7 23/34] partially fix #6563: ui: expose s3 rrd charts in datastore summary Christian Ebner
2026-04-01 13:48 ` [PATCH proxmox-backup v7 24/34] datastore: refactor datastore lookup parameters into dedicated type Christian Ebner
2026-04-01 13:48 ` [PATCH proxmox-backup v7 25/34] api: config: update notification thresholds for config and counters Christian Ebner
2026-04-01 13:48 ` [PATCH proxmox-backup v7 26/34] ui: utils: add helper to render notification threshold property string Christian Ebner
2026-04-01 22:32   ` Thomas Lamprecht
2026-04-01 13:48 ` [PATCH proxmox-backup v7 27/34] ui: add notification thresholds edit window Christian Ebner
2026-04-01 13:48 ` [PATCH proxmox-backup v7 28/34] notification: define templates and template data for thresholds Christian Ebner
2026-04-01 13:48 ` [PATCH proxmox-backup v7 29/34] datastore: add thresholds notification callback on datastore lookup Christian Ebner
2026-04-01 13:48 ` [PATCH proxmox-backup v7 30/34] api/ui: notifications: add 'thresholds' as notification type value Christian Ebner
2026-04-01 13:48 ` [PATCH proxmox-backup v7 31/34] api: config: allow counter reset schedule editing Christian Ebner
2026-04-01 13:48 ` [PATCH proxmox-backup v7 32/34] ui: expose counter reset schedule edit window Christian Ebner
2026-04-01 13:48 ` [PATCH proxmox-backup v7 33/34] bin: proxy: periodically schedule counter reset task Christian Ebner
2026-04-01 13:48 ` [PATCH proxmox-backup v7 34/34] ui: add task description for scheduled counter reset Christian Ebner
2026-04-01 22:20 ` partially-applied: [PATCH proxmox{,-backup} v7 00/34] partially fix #6563: add s3 counter for statistics and notifications Thomas Lamprecht
2026-04-01 22:44 ` applied: " Thomas Lamprecht
2026-04-02 10:54 ` superseded: " 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=20260401134817.926499-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