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 3195F68BA0 for ; Thu, 22 Jul 2021 15:41:39 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 220F011DAD for ; Thu, 22 Jul 2021 15:41:09 +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 id E358311D99 for ; Thu, 22 Jul 2021 15:41:07 +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 B99E442569 for ; Thu, 22 Jul 2021 15:41:07 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Thu, 22 Jul 2021 15:41:05 +0200 Message-Id: <20210722134106.1280517-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210722134106.1280517-1-d.csapak@proxmox.com> References: <20210722134106.1280517-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.529 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 Subject: [pbs-devel] [PATCH proxmox-backup v2 6/7] api2: tape/restore: finish 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: Thu, 22 Jul 2021 13:41:39 -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 change it to a finish and after the loop over the files, before the call to 'finish_temporary_database' (which only renames the file into place) Signed-off-by: Dominik Csapak --- 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 1b0bc03f..806304aa 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.finish()?; + MediaCatalog::finish_temporary_database(status_path, &media_id.label.uuid, true)?; Ok(()) @@ -1150,8 +1152,6 @@ fn restore_archive<'a>( _ => bail!("unknown content magic {:?}", header.content_magic), } - catalog.commit()?; - Ok(()) } -- 2.30.2