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 29F2D1FF13B for ; Wed, 03 Jun 2026 13:04:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 392CF8705; Wed, 3 Jun 2026 13:04:35 +0200 (CEST) Message-ID: <912eeb36-ed92-4c0c-8d2b-6e8ea16ef007@proxmox.com> Date: Wed, 3 Jun 2026 13:04:00 +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: Christian Ebner , 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-AT From: Robert Obkircher In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1780484604355 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.052 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: MVGFN56V24NDWDBIZVWMX24LDDEK7WIG X-Message-ID-Hash: MVGFN56V24NDWDBIZVWMX24LDDEK7WIG X-MailFrom: r.obkircher@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: On 03.06.26 12:35, Christian Ebner wrote: > 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?  This should be fairly cheap in the common case where self.message is None. The bigger issue is that the message is never percent-encoded in the first place. I'd also avoid adding ": " if there is no message. I was going to address this in a v2 for [1] but I can also add a patch to this series. [1] https://lore.proxmox.com/pbs-devel/50fe57b6-d7d4-40a1-9e17-bc904ea30cdd@proxmox.com/ > >>   -        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(()) >>       } >>   } >