From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 2FC831FF13B for ; Wed, 03 Jun 2026 12:36:54 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6E3EE7BE6; Wed, 3 Jun 2026 12:36:53 +0200 (CEST) Message-ID: Date: Wed, 3 Jun 2026 12:36:19 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH proxmox 2/5] pbs-api-types: use match statement for maintenance mode check To: Robert Obkircher , pbs-devel@lists.proxmox.com References: <20260602130001.217482-1-r.obkircher@proxmox.com> <20260602130001.217482-3-r.obkircher@proxmox.com> Content-Language: en-US, de-DE From: Christian Ebner In-Reply-To: <20260602130001.217482-3-r.obkircher@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1780482943199 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.069 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: 55SXKN6A6XTCIBD7G6TQ2JZWWMZSNDDH X-Message-ID-Hash: 55SXKN6A6XTCIBD7G6TQ2JZWWMZSNDDH 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: only one question On 6/2/26 3:00 PM, Robert Obkircher wrote: > Use an exhaustive match statement to be more explicit and to draw > attention when new variants are added. > > Signed-off-by: Robert Obkircher Reviewed-by: Christian Ebner > --- > pbs-api-types/src/maintenance.rs | 27 ++++++++++++--------------- > 1 file changed, 12 insertions(+), 15 deletions(-) > > diff --git a/pbs-api-types/src/maintenance.rs b/pbs-api-types/src/maintenance.rs > index 2adb5d84..7def498b 100644 > --- a/pbs-api-types/src/maintenance.rs > +++ b/pbs-api-types/src/maintenance.rs > @@ -94,25 +94,22 @@ 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("")); question: should we also avoid decoding the message if not using it? Maybe by defining a closure for it? > > - 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(()) > } > }