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 v2 01/13] pbs-api-types: propagate maintenance mode parse errors
Date: Thu,  2 Jul 2026 16:58:58 +0200	[thread overview]
Message-ID: <20260702145916.360488-2-r.obkircher@proxmox.com> (raw)
In-Reply-To: <20260702145916.360488-1-r.obkircher@proxmox.com>

Do not silently ignore errors if the config file is invalid or
contains an unrecognized mode from a future version. This also applies
to set_maintenance_mode, which could previously override such modes if
the enum-fallback feature was disabled.

Upgrades to the new GarbageCollection maintenance mode should be fine
even without this change, because it is unlikely that someone can
enable it before older processes stop initiating new backups or S3
refreshes. There is however a risk that a sync job could unmount the
datastore.

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-api-types/src/datastore.rs | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs
index 7643b0de..8450e69f 100644
--- a/pbs-api-types/src/datastore.rs
+++ b/pbs-api-types/src/datastore.rs
@@ -629,18 +629,22 @@ impl DataStoreConfig {
         }
     }
 
-    pub fn get_maintenance_mode(&self) -> Option<MaintenanceMode> {
-        self.maintenance_mode.as_ref().and_then(|str| {
-            MaintenanceMode::deserialize(proxmox_schema::de::SchemaDeserializer::new(
-                str,
-                &MaintenanceMode::API_SCHEMA,
-            ))
-            .ok()
-        })
+    pub fn get_maintenance_mode(&self) -> Result<Option<MaintenanceMode>, Error> {
+        self.maintenance_mode
+            .as_ref()
+            .map(|str| {
+                MaintenanceMode::deserialize(proxmox_schema::de::SchemaDeserializer::new(
+                    str,
+                    &MaintenanceMode::API_SCHEMA,
+                ))
+                .map_err(|e| format_err!("failed to parse maintenance mode: {e}"))
+            })
+            .transpose()
     }
 
     pub fn set_maintenance_mode(&mut self, new_mode: Option<MaintenanceMode>) -> Result<(), Error> {
-        let current_type = self.get_maintenance_mode().map(|mode| mode.ty);
+        // propagate parse errors because they could indicate a new type variant
+        let current_type = self.get_maintenance_mode()?.map(|mode| mode.ty);
         let new_type = new_mode.as_ref().map(|mode| mode.ty);
 
         match current_type {
-- 
2.47.3





  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 ` Robert Obkircher [this message]
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 ` [PATCH proxmox-backup v2 06/13] datastore: propagate maintenance mode parse errors Robert Obkircher
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-2-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