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 283E8D6E9 for ; Thu, 21 Sep 2023 14:52:15 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0907E1FCD1 for ; Thu, 21 Sep 2023 14:52:15 +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 ; Thu, 21 Sep 2023 14:52:14 +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 DAA28485FE for ; Thu, 21 Sep 2023 14:52:13 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Thu, 21 Sep 2023 14:51:45 +0200 Message-Id: <20230921125207.1301656-4-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230921125207.1301656-1-h.laimer@proxmox.com> References: <20230921125207.1301656-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.018 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 Subject: [pbs-devel] [PATCH proxmox-backup v2 03/25] maintenance: add 'Unpplugged' 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: Thu, 21 Sep 2023 12:52:15 -0000 Signed-off-by: Hannes Laimer --- pbs-api-types/src/maintenance.rs | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/pbs-api-types/src/maintenance.rs b/pbs-api-types/src/maintenance.rs index 1b03ca94..caab9eb5 100644 --- a/pbs-api-types/src/maintenance.rs +++ b/pbs-api-types/src/maintenance.rs @@ -38,7 +38,6 @@ pub enum Operation { /// Maintenance type. pub enum MaintenanceType { // TODO: - // - Add "unmounting" once we got pluggable datastores // - Add "GarbageCollection" or "DeleteOnly" as type and track GC (or all deletes) as separate // operation, so that one can enable a mode where nothing new can be added but stuff can be // cleaned @@ -48,6 +47,8 @@ pub enum MaintenanceType { Offline, /// The datastore is being deleted. Delete, + /// The removable datastore is unplugged + Unplugged, } serde_plain::derive_display_from_serialize!(MaintenanceType); serde_plain::derive_fromstr_from_deserialize!(MaintenanceType); @@ -82,6 +83,10 @@ impl MaintenanceMode { bail!("datastore is being deleted"); } + if self.ty == MaintenanceType::Unplugged { + bail!("datastore is not plugged in"); + } + let message = percent_encoding::percent_decode_str(self.message.as_deref().unwrap_or("")) .decode_utf8() .unwrap_or(Cow::Borrowed("")); @@ -98,3 +103,27 @@ impl MaintenanceMode { Ok(()) } } + +#[test] +fn test_check() { + let ro_mode = MaintenanceMode::new(MaintenanceType::ReadOnly, None); + let offline_mode = MaintenanceMode::new(MaintenanceType::Offline, None); + let delete_mode = MaintenanceMode::new(MaintenanceType::Delete, None); + let unplugged_mode = MaintenanceMode::new(MaintenanceType::Unplugged, None); + + assert!(ro_mode.check(Some(Operation::Lookup)).is_ok()); + assert!(ro_mode.check(Some(Operation::Read)).is_ok()); + assert!(ro_mode.check(Some(Operation::Write)).is_err()); + + assert!(offline_mode.check(Some(Operation::Lookup)).is_ok()); + assert!(offline_mode.check(Some(Operation::Read)).is_err()); + assert!(offline_mode.check(Some(Operation::Write)).is_err()); + + assert!(delete_mode.check(Some(Operation::Lookup)).is_err()); + assert!(delete_mode.check(Some(Operation::Read)).is_err()); + assert!(delete_mode.check(Some(Operation::Write)).is_err()); + + assert!(unplugged_mode.check(Some(Operation::Lookup)).is_err()); + assert!(unplugged_mode.check(Some(Operation::Read)).is_err()); + assert!(unplugged_mode.check(Some(Operation::Write)).is_err()); +} -- 2.39.2