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 C79207A8D1 for ; Tue, 5 Jul 2022 15:08:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E929C2F4C9 for ; Tue, 5 Jul 2022 15:08:52 +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 ; Tue, 5 Jul 2022 15:08:48 +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 801B743977 for ; Tue, 5 Jul 2022 15:08:47 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Tue, 5 Jul 2022 13:08:13 +0000 Message-Id: <20220705130834.14285-8-h.laimer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220705130834.14285-1-h.laimer@proxmox.com> References: <20220705130834.14285-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.043 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [maintenance.rs, datastore.rs] Subject: [pbs-devel] [PATCH proxmox-backup 05/26] api-types: add "unplugged" maintenance type 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: Tue, 05 Jul 2022 13:08:56 -0000 ... and adjust maintenance error message formatting Signed-off-by: Hannes Laimer --- pbs-api-types/src/maintenance.rs | 10 +++++++--- pbs-datastore/src/datastore.rs | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pbs-api-types/src/maintenance.rs b/pbs-api-types/src/maintenance.rs index 5bbba043..4f0dfc7f 100644 --- a/pbs-api-types/src/maintenance.rs +++ b/pbs-api-types/src/maintenance.rs @@ -46,6 +46,8 @@ pub enum MaintenanceType { ReadOnly, /// Neither read nor write operations are allowed on the datastore. Offline, + /// No removable device is mounted + Unplugged, } #[api( @@ -63,7 +65,7 @@ pub enum MaintenanceType { #[derive(Deserialize, Serialize)] /// Maintenance mode pub struct MaintenanceMode { - /// Type of maintenance ("read-only" or "offline"). + /// Type of maintenance ("read-only", "offline" or "unplugged"). #[serde(rename = "type")] ty: MaintenanceType, @@ -80,11 +82,13 @@ impl MaintenanceMode { if let Some(Operation::Lookup) = operation { return Ok(()); + } else if self.ty == MaintenanceType::Unplugged { + bail!(": no removable device associated with the datastore is present"); } else if self.ty == MaintenanceType::Offline { - bail!("offline maintenance mode: {}", message); + bail!(" is in offline maintenance mode: {}", message); } else if self.ty == MaintenanceType::ReadOnly { if let Some(Operation::Write) = operation { - bail!("read-only maintenance mode: {}", message); + bail!(" is in read-only maintenance mode: {}", message); } } Ok(()) diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index 1ae5bcb6..51dbdb23 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -129,7 +129,7 @@ impl DataStore { if let Some(maintenance_mode) = config.get_maintenance_mode() { if let Err(error) = maintenance_mode.check(operation) { - bail!("datastore '{name}' is in {error}"); + bail!("datastore '{name}'{error}"); } } -- 2.30.2