From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup v5 13/20] datastore: refactor shared request counter loading into helper
Date: Wed, 11 Mar 2026 14:08:16 +0100 [thread overview]
Message-ID: <20260311130823.724888-27-c.ebner@proxmox.com> (raw)
In-Reply-To: <20260311130823.724888-1-c.ebner@proxmox.com>
In preparation for also setting/updating the threshold values and
notification callback.
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
pbs-datastore/src/datastore.rs | 84 +++++++++++++++++++---------------
1 file changed, 46 insertions(+), 38 deletions(-)
diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
index ea799dfe5..a2b2f182b 100644
--- a/pbs-datastore/src/datastore.rs
+++ b/pbs-datastore/src/datastore.rs
@@ -707,49 +707,34 @@ impl DataStore {
.parse_property_string(config.backend.as_deref().unwrap_or(""))?,
)?;
- 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()) {
- cache_capacity = fs_info.available / (16 * 1024 * 1024);
- }
- if let Some(max_cache_size) = backend_config.max_cache_size {
+ 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()) {
+ cache_capacity = fs_info.available / (16 * 1024 * 1024);
+ }
+ if let Some(max_cache_size) = backend_config.max_cache_size {
+ info!(
+ "Got requested max cache size {max_cache_size} for store {}",
+ config.name
+ );
+ let max_cache_capacity = max_cache_size.as_u64() / (16 * 1024 * 1024);
+ cache_capacity = cache_capacity.min(max_cache_capacity);
+ }
+ let cache_capacity = usize::try_from(cache_capacity).unwrap_or_default();
+
info!(
- "Got requested max cache size {max_cache_size} for store {}",
+ "Using datastore cache with capacity {cache_capacity} for store {}",
config.name
);
- let max_cache_capacity = max_cache_size.as_u64() / (16 * 1024 * 1024);
- cache_capacity = cache_capacity.min(max_cache_capacity);
- }
- let cache_capacity = usize::try_from(cache_capacity).unwrap_or_default();
- info!(
- "Using datastore cache with capacity {cache_capacity} for store {}",
- config.name
- );
+ let cache = LocalDatastoreLruCache::new(cache_capacity, chunk_store.clone());
+ let request_counters = Self::request_counters(&config, &backend_config)?;
- let cache = LocalDatastoreLruCache::new(cache_capacity, chunk_store.clone());
-
- 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)
- };
+ (Some(cache), Some(Arc::new(request_counters)))
+ } else {
+ (None, None)
+ };
let thread_settings = DatastoreThreadSettings::new(
tuning.default_verification_workers,
@@ -771,6 +756,29 @@ impl DataStore {
})
}
+ /// Load the shared s3 request counters for given datastore and backend config
+ pub fn request_counters(
+ config: &DataStoreConfig,
+ backend_config: &DatastoreBackendConfig,
+ ) -> Result<SharedRequestCounters, Error> {
+ 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()?)?;
+ Ok(request_counters)
+ }
+
// Requires obtaining a shared chunk store lock beforehand
pub fn create_fixed_writer<P: AsRef<Path>>(
&self,
--
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 ` Christian Ebner [this message]
2026-03-11 13:08 ` [PATCH proxmox-backup v5 14/20] api: config: update notification thresholds for config and counters Christian Ebner
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-27-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