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 EE51F1FF13B for ; Wed, 11 Mar 2026 11:00:03 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0EB5414333; Wed, 11 Mar 2026 10:59:59 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox v2 1/2] pbs-api-types: make operation non-optional for maintenance-mode check Date: Wed, 11 Mar 2026 10:59:01 +0100 Message-ID: <20260311095906.202410-2-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260311095906.202410-1-c.ebner@proxmox.com> References: <20260311095906.202410-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1773223127705 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.056 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: JCOQZ3E46Z43P7PDUEH232BRQ5D2ZTXM X-Message-ID-Hash: JCOQZ3E46Z43P7PDUEH232BRQ5D2ZTXM 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: This checks the availability of the datastore constrained by the currently set maintenance-mode, based on the operation the caller would like to perform. In an effort to force the operation to be set when performing datastore operations, make this non optional for the maintenance mode checks. Signed-off-by: Christian Ebner --- pbs-api-types/src/maintenance.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pbs-api-types/src/maintenance.rs b/pbs-api-types/src/maintenance.rs index baf4e29a..fc7d240d 100644 --- a/pbs-api-types/src/maintenance.rs +++ b/pbs-api-types/src/maintenance.rs @@ -93,7 +93,7 @@ impl MaintenanceMode { || self.ty == MaintenanceType::Unmount } - pub fn check(&self, operation: Option) -> Result<(), Error> { + pub fn check(&self, operation: Operation) -> Result<(), Error> { if self.ty == MaintenanceType::Delete { bail!("datastore is being deleted"); } @@ -102,7 +102,7 @@ impl MaintenanceMode { .decode_utf8() .unwrap_or(Cow::Borrowed("")); - if let Some(Operation::Lookup) = operation { + if Operation::Lookup == operation { return Ok(()); } else if self.ty == MaintenanceType::Unmount { bail!("datastore is being unmounted"); @@ -110,9 +110,7 @@ impl MaintenanceMode { bail!("offline maintenance mode: {}", message); } else if self.ty == MaintenanceType::S3Refresh { bail!("S3 refresh maintenance mode: {}", message); - } else if self.ty == MaintenanceType::ReadOnly - && let Some(Operation::Write) = operation - { + } else if self.ty == MaintenanceType::ReadOnly && Operation::Write == operation { bail!("read-only maintenance mode: {}", message); } Ok(()) -- 2.47.3