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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 49AE6951BB for ; Tue, 28 Feb 2023 14:17:25 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2DCFE7281 for ; Tue, 28 Feb 2023 14:17:25 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 28 Feb 2023 14:17:23 +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 9EE0148B66 for ; Tue, 28 Feb 2023 14:17:23 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 28 Feb 2023 14:17:20 +0100 Message-Id: <20230228131722.955886-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.061 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. [drive.rs] Subject: [pbs-devel] [PATCH proxmox-backup v2 1/3] tape: inventory: don't skip unassigned tapes completely 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, 28 Feb 2023 13:17:25 -0000 since commit 139acf37 ("tape: inventory: skip unassigned tapes") we skip unassigned tapes (special all-zero media-set uuid) when we look for a catalog. We accidentally skipped storing it in the inventory completely, which means we never inventoried completely empty tapes. to fix that, simply move the check below the inserting in the inventory Fixes: 139acf37 ("tape: inventory: skip unassigned tapes") Signed-off-by: Dominik Csapak --- src/api2/tape/drive.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/api2/tape/drive.rs b/src/api2/tape/drive.rs index 16ea5f98..a66c999c 100644 --- a/src/api2/tape/drive.rs +++ b/src/api2/tape/drive.rs @@ -953,14 +953,15 @@ pub fn update_inventory( ); if let Some(ref set) = media_id.media_set_label { - if set.unassigned() { - continue; - } let _pool_lock = lock_media_pool(TAPE_STATUS_DIR, &set.pool)?; let _lock = lock_media_set(TAPE_STATUS_DIR, &set.uuid, None)?; MediaCatalog::destroy_unrelated_catalog(TAPE_STATUS_DIR, &media_id)?; inventory.store(media_id.clone(), false)?; + if set.unassigned() { + continue; + } + if catalog { let media_set = inventory.compute_media_set_members(&set.uuid)?; if let Err(err) = fast_catalog_restore( -- 2.30.2