From: Robert Obkircher <r.obkircher@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox v2 02/13] pbs-api-types: use match statement for maintenance mode check
Date: Thu, 2 Jul 2026 16:58:59 +0200 [thread overview]
Message-ID: <20260702145916.360488-3-r.obkircher@proxmox.com> (raw)
In-Reply-To: <20260702145916.360488-1-r.obkircher@proxmox.com>
Use an exhaustive match statement to be more explicit and to draw
attention when new variants are added.
Signed-off-by: Robert Obkircher <r.obkircher@proxmox.com>
---
pbs-api-types/src/maintenance.rs | 35 ++++++++++++++++----------------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/pbs-api-types/src/maintenance.rs b/pbs-api-types/src/maintenance.rs
index 2adb5d84..9a1729f4 100644
--- a/pbs-api-types/src/maintenance.rs
+++ b/pbs-api-types/src/maintenance.rs
@@ -94,25 +94,24 @@ impl MaintenanceMode {
}
pub fn check(&self, operation: Operation) -> Result<(), Error> {
- if self.ty == MaintenanceType::Delete {
- bail!("datastore is being deleted");
- }
-
- let message = percent_encoding::percent_decode_str(self.message.as_deref().unwrap_or(""))
- .decode_utf8()
- .unwrap_or(Cow::Borrowed(""));
+ let message = || {
+ percent_encoding::percent_decode_str(self.message.as_deref().unwrap_or(""))
+ .decode_utf8()
+ .unwrap_or(Cow::Borrowed(""))
+ };
- if Operation::Lookup == operation {
- return Ok(());
- } else if self.ty == MaintenanceType::Unmount {
- bail!("datastore is being unmounted");
- } else if self.ty == MaintenanceType::Offline {
- bail!("offline maintenance mode: {}", message);
- } else if self.ty == MaintenanceType::S3Refresh {
- bail!("S3 refresh maintenance mode: {}", message);
- } else if self.ty == MaintenanceType::ReadOnly && Operation::Write == operation {
- bail!("read-only maintenance mode: {}", message);
+ match (self.ty, operation) {
+ (MaintenanceType::Delete, _) => bail!("datastore is being deleted"),
+ (_, Operation::Lookup) => Ok(()),
+ (MaintenanceType::Unmount, _) => bail!("datastore is being unmounted"),
+ (MaintenanceType::Offline, _) => bail!("offline maintenance mode: {}", message()),
+ (MaintenanceType::S3Refresh, _) => bail!("S3 refresh maintenance mode: {}", message()),
+ (MaintenanceType::ReadOnly, Operation::Read) => Ok(()),
+ (MaintenanceType::ReadOnly, Operation::Write) => {
+ bail!("read-only maintenance mode: {}", message())
+ }
+ #[cfg(feature = "enum-fallback")]
+ (MaintenanceType::UnknownEnumValue(_), _) => Ok(()),
}
- Ok(())
}
}
--
2.47.3
next prev 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 ` Robert Obkircher [this message]
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-3-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