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 DDD12C6D1 for ; Tue, 29 Nov 2022 15:17:04 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C632C6FBC for ; Tue, 29 Nov 2022 15:17:04 +0100 (CET) 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, 29 Nov 2022 15:17:03 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3E3D944C08 for ; Tue, 29 Nov 2022 15:17:03 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 29 Nov 2022 15:17:00 +0100 Message-Id: <20221129141701.4109478-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.064 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [media.rs, inventory.rs, mod.rs, drive.rs] Subject: [pbs-devel] [PATCH proxmox-backup v2 1/2] tape: hide internal use of all zero uuid for unassigned tapes 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, 29 Nov 2022 14:17:04 -0000 a tape assigned to a pool but no media-set, gets the special 'all zero' media set in it's MediaSetLabel. Instead of having that constant scattered all over the code, hide this fact by using wrapper functions to initialize it that way and to check for it Signed-off-by: Dominik Csapak --- replaces my previous patch: tape: refactor uuid of empty media set into constant src/api2/tape/drive.rs | 6 +++--- src/api2/tape/media.rs | 3 +-- src/tape/file_formats/mod.rs | 8 ++++++++ src/tape/inventory.rs | 26 +++++++++++--------------- src/tape/media_pool.rs | 2 +- 5 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/api2/tape/drive.rs b/src/api2/tape/drive.rs index 107bcfd8..2175a460 100644 --- a/src/api2/tape/drive.rs +++ b/src/api2/tape/drive.rs @@ -528,7 +528,7 @@ fn write_media_label( label.label_text, pool ); - let set = MediaSetLabel::with_data(pool, [0u8; 16].into(), 0, label.ctime, None); + let set = MediaSetLabel::new_unassigned(pool, label.ctime); drive.write_media_set_label(&set, None)?; @@ -575,7 +575,7 @@ fn write_media_label( if let Some(ref pool) = pool { match info.media_set_label { Some(set) => { - if set.uuid != [0u8; 16].into() { + if !set.unassigned() { bail!("verify media set label failed - got wrong set uuid"); } if &set.pool != pool { @@ -1301,7 +1301,7 @@ pub fn catalog_media( return Ok(()); } Some(ref set) => { - if set.uuid.as_ref() == [0u8; 16] { + if set.unassigned() { // media is empty task_log!(worker, "media is empty"); let _lock = lock_unassigned_media_pool(TAPE_STATUS_DIR)?; diff --git a/src/api2/tape/media.rs b/src/api2/tape/media.rs index ed0105b0..cdeffd5b 100644 --- a/src/api2/tape/media.rs +++ b/src/api2/tape/media.rs @@ -336,8 +336,7 @@ pub fn destroy_media(label_text: String, force: Option) -> Result<(), Erro if !force { if let Some(ref set) = media_id.media_set_label { - let is_empty = set.uuid.as_ref() == [0u8; 16]; - if !is_empty { + if !set.unassigned() { bail!( "media '{}' contains data (please use 'force' flag to remove.", label_text diff --git a/src/tape/file_formats/mod.rs b/src/tape/file_formats/mod.rs index 2b7c9866..f80e2d90 100644 --- a/src/tape/file_formats/mod.rs +++ b/src/tape/file_formats/mod.rs @@ -168,4 +168,12 @@ impl MediaSetLabel { encryption_key_fingerprint, } } + + pub fn new_unassigned(pool: &str, ctime: i64) -> Self { + Self::with_data(pool, [0u8; 16].into(), 0, ctime, None) + } + + pub fn unassigned(&self) -> bool { + self.uuid.as_ref() == [0u8; 16] + } } diff --git a/src/tape/inventory.rs b/src/tape/inventory.rs index 9c5887d7..dd560179 100644 --- a/src/tape/inventory.rs +++ b/src/tape/inventory.rs @@ -185,7 +185,7 @@ impl Inventory { // do not overwrite unsaved pool assignments if media_id.media_set_label.is_none() { if let Some(ref set) = previous.id.media_set_label { - if set.uuid.as_ref() == [0u8; 16] { + if set.unassigned() { media_id.media_set_label = Some(set.clone()); } } @@ -251,15 +251,11 @@ impl Inventory { pub fn lookup_media_pool(&self, uuid: &Uuid) -> Option<(&str, bool)> { match self.map.get(uuid) { None => None, - Some(entry) => { - match entry.id.media_set_label { - None => None, // not assigned to any pool - Some(ref set) => { - let is_empty = set.uuid.as_ref() == [0u8; 16]; - Some((&set.pool, is_empty)) - } - } - } + Some(entry) => entry + .id + .media_set_label + .as_ref() + .map(|set| (set.pool.as_str(), set.unassigned())), } } @@ -275,7 +271,7 @@ impl Inventory { continue; // belong to another pool } - if set.uuid.as_ref() == [0u8; 16] { + if set.unassigned() { list.push(MediaId { label: entry.id.label.clone(), media_set_label: None, @@ -298,7 +294,7 @@ impl Inventory { match entry.id.media_set_label { None => continue, // not assigned to any pool Some(ref set) => { - if set.uuid.as_ref() != [0u8; 16] { + if set.unassigned() { list.push(entry.id.clone()); } } @@ -410,7 +406,7 @@ impl Inventory { .map .values() .filter_map(|entry| entry.id.media_set_label.as_ref()) - .filter(|set| set.pool == pool && set.uuid.as_ref() != [0u8; 16]); + .filter(|set| set.pool == pool && !set.unassigned()); for set in set_list { match last_set { @@ -435,7 +431,7 @@ impl Inventory { .map .values() .filter_map(|entry| entry.id.media_set_label.as_ref()) - .filter(|set| set.pool == pool && set.uuid.as_ref() != [0u8; 16]); + .filter(|set| set.pool == pool && !set.unassigned()); for set in set_list { if set.uuid != uuid && set.ctime >= ctime { @@ -600,7 +596,7 @@ impl Inventory { let uuid = label.uuid.clone(); - let set = MediaSetLabel::with_data(pool, [0u8; 16].into(), 0, ctime, None); + let set = MediaSetLabel::new_unassigned(pool, ctime); self.store( MediaId { diff --git a/src/tape/media_pool.rs b/src/tape/media_pool.rs index eb477885..e1bba9ab 100644 --- a/src/tape/media_pool.rs +++ b/src/tape/media_pool.rs @@ -181,7 +181,7 @@ impl MediaPool { // should never trigger return (MediaStatus::Unknown, location); // belong to another pool } - if set.uuid.as_ref() == [0u8; 16] { + if set.unassigned() { // not assigned to any pool return (MediaStatus::Writable, location); } -- 2.30.2