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 36A7D772C4 for ; Tue, 20 Jul 2021 10:55:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 20A3E2D899 for ; Tue, 20 Jul 2021 10:55: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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 628E22D88D for ; Tue, 20 Jul 2021 10:55:13 +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 218AA41A86 for ; Tue, 20 Jul 2021 10:55:13 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 20 Jul 2021 10:55:11 +0200 Message-Id: <20210720085511.1767928-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.557 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. [proxmox.com, restore.rs] Subject: [pbs-devel] [PATCH proxmox-backup] api2: tape/restore: commit temporary catalog at the end 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, 20 Jul 2021 08:55:45 -0000 in 'restore_archive', we reach that 'catalog.commit()' for * every skipped snapshot (we already call 'commit_if_large' then before) * every skipped chunk archive (no change in catalog since we do not read the chunk archive in that case) * after reading a catalog (no change in catalog) in all other cases, we call 'commit_if_large' and return early, meaning that the 'commit' there was executed too often and unnecessary, so move it after the loop over the files, before finishing the temporary database. Signed-off-by: Dominik Csapak --- this should reduce the number of commits quite a bit, and make my previous series[0] work ok 0: https://lists.proxmox.com/pipermail/pbs-devel/2021-July/003711.html src/api2/tape/restore.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api2/tape/restore.rs b/src/api2/tape/restore.rs index f959a856..8a8e8a36 100644 --- a/src/api2/tape/restore.rs +++ b/src/api2/tape/restore.rs @@ -998,6 +998,8 @@ pub fn restore_media( restore_archive(worker.clone(), reader, current_file_number, target, &mut catalog, checked_chunks_map, verbose)?; } + catalog.commit()?; + MediaCatalog::finish_temporary_database(status_path, &media_id.label.uuid, true)?; Ok(()) @@ -1153,8 +1155,6 @@ fn restore_archive<'a>( _ => bail!("unknown content magic {:?}", header.content_magic), } - catalog.commit()?; - Ok(()) } -- 2.30.2