From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 96EC67AD6C for ; Wed, 6 Jul 2022 13:41:09 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8D711AA7A for ; Wed, 6 Jul 2022 13:40:39 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 6 Jul 2022 13:40:39 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id CFF1943CD1 for ; Wed, 6 Jul 2022 13:40:38 +0200 (CEST) Date: Wed, 6 Jul 2022 13:40:37 +0200 From: Wolfgang Bumiller To: Hannes Laimer Cc: pbs-devel@lists.proxmox.com Message-ID: <20220706114037.wmixutcqybupyyol@casey.proxmox.com> References: <20220705130834.14285-1-h.laimer@proxmox.com> <20220705130834.14285-9-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220705130834.14285-9-h.laimer@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.290 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pbs-devel] [PATCH proxmox-backup 06/26] api-types: add set_maintenance_mode function to DataStoreConfig X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jul 2022 11:41:09 -0000 On Tue, Jul 05, 2022 at 01:08:14PM +0000, Hannes Laimer wrote: > helper for updating the MaintenanceMode of a Datastore not through the > API > > Signed-off-by: Hannes Laimer > --- > pbs-api-types/src/datastore.rs | 9 +++++++++ > pbs-api-types/src/maintenance.rs | 6 +++++- > 2 files changed, 14 insertions(+), 1 deletion(-) > > diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs > index 965e3795..ce77f47d 100644 > --- a/pbs-api-types/src/datastore.rs > +++ b/pbs-api-types/src/datastore.rs > @@ -313,6 +313,15 @@ impl DataStoreConfig { > .and_then(|str| MaintenanceMode::API_SCHEMA.parse_property_string(str).ok()) > .and_then(|value| MaintenanceMode::deserialize(value).ok()) > } > + > + pub fn set_maintenance_mode(&mut self, mode: MaintenanceMode) { > + if let Some(property_string) = MaintenanceMode::API_SCHEMA Instead of using the `API_SCHEMA` *here*, this should be a helper method in `MaintenanceMode`. And I don't think it should be able to fail. Given that `MaintenanceMode` currently is just a mode with a reason string, the stringification (& potential string quoting) could be done there without a fully generic `print_property_string` helper way more easily ;-) > + .print_property_string(&mode) > + .ok() > + { > + self.maintenance_mode = Some(property_string); > + } > + } > } > > #[api( > diff --git a/pbs-api-types/src/maintenance.rs b/pbs-api-types/src/maintenance.rs > index 4f0dfc7f..ec34397f 100644 > --- a/pbs-api-types/src/maintenance.rs > +++ b/pbs-api-types/src/maintenance.rs > @@ -67,7 +67,7 @@ pub enum MaintenanceType { > pub struct MaintenanceMode { > /// Type of maintenance ("read-only", "offline" or "unplugged"). > #[serde(rename = "type")] > - ty: MaintenanceType, > + pub ty: MaintenanceType, > > /// Reason for maintenance. > #[serde(skip_serializing_if = "Option::is_none")] > @@ -75,6 +75,10 @@ pub struct MaintenanceMode { > } > > impl MaintenanceMode { > + pub fn new(ty: MaintenanceType, message: Option) -> Self { > + MaintenanceMode { ty, message } > + } > + > pub fn check(&self, operation: Option) -> Result<(), Error> { > let message = percent_encoding::percent_decode_str(self.message.as_deref().unwrap_or("")) > .decode_utf8() > -- > 2.30.2