public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Robert Obkircher <r.obkircher@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup v2 06/13] datastore: propagate maintenance mode parse errors
Date: Thu,  2 Jul 2026 16:59:03 +0200	[thread overview]
Message-ID: <20260702145916.360488-7-r.obkircher@proxmox.com> (raw)
In-Reply-To: <20260702145916.360488-1-r.obkircher@proxmox.com>

Handle maintenance mode parse errors since they are no longer silently
mapped to None. That was problematic because during upgrades the older
version would have potentially ignored a newly introduced maintenance
mode.

Signed-off-by: Robert Obkircher <r.obkircher@proxmox.com>
Reviewed-by: Christian Ebner <c.ebner@proxmox.com>
Tested-by: Christian Ebner <c.ebner@proxmox.com>
---
 pbs-datastore/src/datastore.rs      | 17 ++++++++++++-----
 src/api2/admin/datastore.rs         |  2 +-
 src/server/metric_collection/mod.rs |  7 +++----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
index e2d1ae67c..da7eba80e 100644
--- a/pbs-datastore/src/datastore.rs
+++ b/pbs-datastore/src/datastore.rs
@@ -303,9 +303,16 @@ impl Drop for DataStore {
                 Ok((section_config, _gen)) => {
                     match section_config.lookup::<DataStoreConfig>("datastore", self.name()) {
                         // second check: check if maintenance mode requires closing FDs
-                        Ok(config) => config
-                            .get_maintenance_mode()
-                            .is_some_and(|m| m.clear_from_cache()),
+                        Ok(config) => match config.get_maintenance_mode() {
+                            Ok(m) => m.is_some_and(|m| m.clear_from_cache()),
+                            Err(err) => {
+                                log::warn!(
+                                    "DataStore::drop: datastore '{}' in unknown maintenance mode; evicting cached instance: {err}",
+                                    self.name()
+                                );
+                                true
+                            }
+                        },
                         Err(err) => {
                             // datastore removed from config; evict cached entry if available (without checking maintenance mode)
                             log::warn!(
@@ -576,7 +583,7 @@ impl DataStore {
         let (section_config, gen_num) = datastore_section_config_cached(true)?;
         let config: DataStoreConfig = section_config.lookup("datastore", lookup.name)?;
 
-        if let Some(maintenance_mode) = config.get_maintenance_mode() {
+        if let Some(maintenance_mode) = config.get_maintenance_mode()? {
             if let Err(error) = maintenance_mode.check(lookup.operation) {
                 bail!("datastore '{}' is unavailable: {error}", lookup.name);
             }
@@ -660,7 +667,7 @@ impl DataStore {
         let datastore: DataStoreConfig = config.lookup("datastore", name)?;
         if datastore
             .get_maintenance_mode()
-            .is_some_and(|m| m.clear_from_cache())
+            .map_or(true, |m| m.is_some_and(|m| m.clear_from_cache()))
         {
             // the datastore drop handler does the checking if tasks are running and clears the
             // cache entry, so we just have to trigger it here
diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index 39e8a1ce8..2f8b93f7f 100644
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -2703,7 +2703,7 @@ fn expect_maintenance_type(
     let store_config: DataStoreConfig = section_config.lookup("datastore", store)?;
 
     if store_config
-        .get_maintenance_mode()
+        .get_maintenance_mode()?
         .is_none_or(|m| m.ty != maintenance_type)
     {
         bail!("maintenance mode is not '{maintenance_type}'");
diff --git a/src/server/metric_collection/mod.rs b/src/server/metric_collection/mod.rs
index 18625b1a5..299156f8e 100644
--- a/src/server/metric_collection/mod.rs
+++ b/src/server/metric_collection/mod.rs
@@ -286,10 +286,9 @@ fn collect_disk_stats_sync() -> (DiskStat, Vec<DatastoreStats>) {
                 .unwrap_or_default();
 
             for config in datastore_list {
-                if config
-                    .get_maintenance_mode()
-                    .is_some_and(|mode| mode.check(Operation::Read).is_err())
-                {
+                if config.get_maintenance_mode().map_or(true, |m| {
+                    m.is_some_and(|mode| mode.check(Operation::Read).is_err())
+                }) {
                     continue;
                 }
 
-- 
2.47.3





  parent reply	other threads:[~2026-07-02 15:00 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-02 14:58 [PATCH proxmox{,-backup} v2 00/13] add GarbageCollection maintenance mode Robert Obkircher
2026-07-02 14:58 ` [PATCH proxmox v2 01/13] pbs-api-types: propagate maintenance mode parse errors Robert Obkircher
2026-07-02 14:58 ` [PATCH proxmox v2 02/13] pbs-api-types: use match statement for maintenance mode check Robert Obkircher
2026-07-02 14:59 ` [PATCH proxmox v2 03/13] pbs-api-types: deny non-lookup operations for unknown modes Robert Obkircher
2026-07-02 14:59 ` [PATCH proxmox v2 04/13] pbs-api-types: add WriteNonExpanding datastore operation Robert Obkircher
2026-07-02 14:59 ` [PATCH proxmox v2 05/13] pbs-api-types: add GarbageCollection maintenance mode Robert Obkircher
2026-07-02 14:59 ` Robert Obkircher [this message]
2026-07-02 14:59 ` [PATCH proxmox-backup v2 07/13] task tracking: only read starttime when needed Robert Obkircher
2026-07-02 14:59 ` [PATCH proxmox-backup v2 08/13] task tracking: use parameter for initial count and refactor updates Robert Obkircher
2026-07-02 14:59 ` [PATCH proxmox-backup v2 09/13] www: access active operation fields by name instead of index Robert Obkircher
2026-07-02 14:59 ` [PATCH proxmox-backup v2 10/13] task tracking: count WriteNonExpanding datastore operations Robert Obkircher
2026-07-02 14:59 ` [PATCH proxmox-backup v2 11/13] datastore: open datastores with WriteNonExpanding instead of Write Robert Obkircher
2026-07-02 14:59 ` [PATCH proxmox-backup v2 12/13] fix #5797: www: display new GarbageCollection maintenance mode Robert Obkircher
2026-07-02 14:59 ` [PATCH proxmox-backup v2 13/13] docs: document garbage-collection " Robert Obkircher

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=20260702145916.360488-7-r.obkircher@proxmox.com \
    --to=r.obkircher@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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal