From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 7AC3B1FF13B for ; Wed, 03 Jun 2026 12:33:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3C9577A4D; Wed, 3 Jun 2026 12:33:43 +0200 (CEST) Message-ID: <7700e71b-9cb1-47b2-a78f-96c98259bb3b@proxmox.com> Date: Wed, 3 Jun 2026 12:33:39 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH proxmox 1/5] pbs-api-types: propagate maintenance mode parse errors To: Robert Obkircher , pbs-devel@lists.proxmox.com References: <20260602130001.217482-1-r.obkircher@proxmox.com> <20260602130001.217482-2-r.obkircher@proxmox.com> Content-Language: en-US, de-DE From: Christian Ebner In-Reply-To: <20260602130001.217482-2-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: 1780482783563 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [datastore.rs] Message-ID-Hash: FCGRSVBV46BAYLTHEP3QTB3NNJVZXBU3 X-Message-ID-Hash: FCGRSVBV46BAYLTHEP3QTB3NNJVZXBU3 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: a few minor comments only On 6/2/26 3:00 PM, Robert Obkircher wrote: > Do not silently ignore errors if the config file is invalid or > contains a new mode from a future version. The commit message should also include an explicit statement that set_maintenance_mode() now fails when mode cannot be parsed and that this does not interfere with the current behavior when `enum-fallback` is enabled. > Upgrades to the new GarbageCollection maintenance mode should be fine > even without this change, becausue 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 > --- > 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..b770bc03 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 { > - 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, 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) -> Result<(), Error> { > - let current_type = self.get_maintenance_mode().map(|mode| mode.ty); > + // it is probably best to error out if the current mode can't be parsed: This comment would benefit from including a bit more reasoning: e.g. never allow setting of maintenance mode on parsing errors for current mode, possible new maintenance 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 { Slightly unrelated, but since noted during review and and this fits to the patch series: the docstrings for `ty` in MaintenanceMode and `maintenance_mode` in DataStoreConfig are outdated and need to be updated. With that addressed: Reviewed-by: Christian Ebner