From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 758F11FF142 for ; Mon, 16 Feb 2026 13:13:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A0E63109AF; Mon, 16 Feb 2026 13:14:33 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup v2 03/12] datastore: expose request counters for s3 backed datastores Date: Mon, 16 Feb 2026 13:13:57 +0100 Message-ID: <20260216121406.99617-10-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260216121406.99617-1-c.ebner@proxmox.com> References: <20260216121406.99617-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1771244054777 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.048 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: EW53SZK5TW3VUG52UTWIOMQGLYYQWD7M X-Message-ID-Hash: EW53SZK5TW3VUG52UTWIOMQGLYYQWD7M X-MailFrom: c.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Allows to introspect the current state of the request counters related to a datastore. With the intention to show the request counter statistics in the ui and allow to use them for soft limits and warnings via the notification system in the future. Signed-off-by: Christian Ebner --- changes since version 1: - no changes pbs-datastore/src/datastore.rs | 48 ++++++++++++++++++++++++++++++---- src/api2/admin/datastore.rs | 4 +++ 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index 957e900d6..b105564b8 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -3,12 +3,14 @@ use std::io::{self, Write}; use std::os::unix::ffi::OsStrExt; use std::os::unix::io::AsRawFd; use std::path::{Path, PathBuf}; +use std::sync::atomic::Ordering; use std::sync::{Arc, LazyLock, Mutex}; use std::time::{Duration, SystemTime}; use anyhow::{bail, format_err, Context, Error}; use http_body_util::BodyExt; use hyper::body::Bytes; +use hyper::Method; use nix::unistd::{unlinkat, UnlinkatFlags}; use pbs_tools::lru_cache::LruCache; use tokio::io::AsyncWriteExt; @@ -17,7 +19,7 @@ use tracing::{info, warn}; use proxmox_human_byte::HumanByte; use proxmox_s3_client::{ S3Client, S3ClientConf, S3ClientOptions, S3ObjectKey, S3PathPrefix, S3RateLimiterOptions, - S3RequestCounterOptions, + S3RequestCounterOptions, SharedRequestCounters, }; use proxmox_schema::ApiType; @@ -32,7 +34,7 @@ use pbs_api_types::{ ArchiveType, Authid, BackupGroupDeleteStats, BackupNamespace, BackupType, ChunkOrder, DataStoreConfig, DatastoreBackendConfig, DatastoreBackendType, DatastoreFSyncLevel, DatastoreTuning, GarbageCollectionCacheStats, GarbageCollectionStatus, MaintenanceMode, - MaintenanceType, Operation, UPID, + MaintenanceType, Operation, S3Statistics, UPID, }; use pbs_config::s3::S3_CFG_TYPE_ID; use pbs_config::{BackupLockGuard, ConfigVersionCache}; @@ -177,6 +179,7 @@ pub struct DataStoreImpl { /// datastore.cfg cache generation number at lookup time, used to /// invalidate this cached `DataStoreImpl` config_generation: Option, + request_counters: Option>, } impl DataStoreImpl { @@ -194,6 +197,7 @@ impl DataStoreImpl { lru_store_caching: None, thread_settings: Default::default(), config_generation: None, + request_counters: None, }) } } @@ -451,6 +455,22 @@ impl DataStore { Ok(backend_type) } + /// Get the s3 statistics for this datastore + pub fn s3_statistics(&self) -> Option { + self.inner + .request_counters + .as_ref() + .map(|counters| S3Statistics { + get: counters.load(Method::GET, Ordering::Acquire), + put: counters.load(Method::PUT, Ordering::Acquire), + post: counters.load(Method::POST, Ordering::Acquire), + delete: counters.load(Method::DELETE, Ordering::Acquire), + head: counters.load(Method::HEAD, Ordering::Acquire), + uploaded: counters.get_upload_traffic(Ordering::Acquire), + downloaded: counters.get_download_traffic(Ordering::Acquire), + }) + } + pub fn cache(&self) -> Option<&LocalDatastoreLruCache> { self.inner.lru_store_caching.as_ref() } @@ -654,7 +674,8 @@ impl DataStore { .parse_property_string(config.backend.as_deref().unwrap_or(""))?, )?; - let lru_store_caching = if DatastoreBackendType::S3 == backend_config.ty.unwrap_or_default() + let (lru_store_caching, request_counters) = if DatastoreBackendType::S3 + == backend_config.ty.unwrap_or_default() { let mut cache_capacity = 0; if let Ok(fs_info) = proxmox_sys::fs::fs_info(&chunk_store.base_path()) { @@ -676,9 +697,25 @@ impl DataStore { ); let cache = LocalDatastoreLruCache::new(cache_capacity, chunk_store.clone()); - Some(cache) + + let path = format!( + "{}/{}-{}-{}.shmem", + S3_CLIENT_REQUEST_COUNTER_BASE_PATH, + backend_config + .client + .as_ref() + .ok_or(format_err!("missing s3 endpoint id"))?, + backend_config + .bucket + .as_ref() + .ok_or(format_err!("missing s3 bucket"))?, + config.name, + ); + let request_counters = + SharedRequestCounters::open_shared_memory_mapped(path, pbs_config::backup_user()?)?; + (Some(cache), Some(Arc::new(request_counters))) } else { - None + (None, None) }; let thread_settings = DatastoreThreadSettings::new( @@ -697,6 +734,7 @@ impl DataStore { lru_store_caching, thread_settings, config_generation: generation, + request_counters, }) } diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 88ad5d53b..d71112475 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -622,6 +622,8 @@ pub async fn status( (None, None) }; + let s3_statistics = datastore.s3_statistics(); + Ok(if store_stats { let storage = crate::tools::fs::fs_info(datastore.base_path()).await?; DataStoreStatus { @@ -630,6 +632,7 @@ pub async fn status( avail: storage.available, gc_status, counts, + s3_statistics, } } else { DataStoreStatus { @@ -638,6 +641,7 @@ pub async fn status( avail: 0, gc_status, counts, + s3_statistics, } }) } -- 2.47.3