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 79438C731 for ; Tue, 29 Nov 2022 15:17:03 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5EA276F8A for ; Tue, 29 Nov 2022 15:17:03 +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, 29 Nov 2022 15:17:02 +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 94BE544D2D for ; Tue, 29 Nov 2022 15:17:02 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 29 Nov 2022 15:17:01 +0100 Message-Id: <20221129141701.4109478-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221129141701.4109478-1-d.csapak@proxmox.com> References: <20221129141701.4109478-1-d.csapak@proxmox.com> 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. [drive.rs] Subject: [pbs-devel] [PATCH proxmox-backup v2 2/2] tape: inventory: skip 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:03 -0000 tapes that are labeled into a pool but are not in a media-set yet, belong to the special 'all zero' media-set. these will never have a catalog on them, so skip them fixes the issue, that an inventory with 'catalog restore' aborted on such a tape Signed-off-by: Dominik Csapak --- changes from v1: * use the 'unassigned' function of the MediaSetLabel * better commit message src/api2/tape/drive.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/api2/tape/drive.rs b/src/api2/tape/drive.rs index 2175a460..f8f29d88 100644 --- a/src/api2/tape/drive.rs +++ b/src/api2/tape/drive.rs @@ -952,17 +952,17 @@ pub fn update_inventory( media_id.label.uuid ); - if let Some(MediaSetLabel { - ref pool, ref uuid, .. - }) = media_id.media_set_label - { - let _pool_lock = lock_media_pool(TAPE_STATUS_DIR, pool)?; - let _lock = lock_media_set(TAPE_STATUS_DIR, uuid, None)?; + 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 catalog { - let media_set = inventory.compute_media_set_members(uuid)?; + let media_set = inventory.compute_media_set_members(&set.uuid)?; if let Err(err) = fast_catalog_restore( &worker, &mut drive, -- 2.30.2