From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <dietmar@proxmox.com>
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 1615769B70
 for <pbs-devel@lists.proxmox.com>; Wed, 28 Jul 2021 11:30:10 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
 by firstgate.proxmox.com (Proxmox) with ESMTP id 05039225ED
 for <pbs-devel@lists.proxmox.com>; Wed, 28 Jul 2021 11:29:40 +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 0681B225DF
 for <pbs-devel@lists.proxmox.com>; Wed, 28 Jul 2021 11:29:39 +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 D006E42AE9
 for <pbs-devel@lists.proxmox.com>; Wed, 28 Jul 2021 11:29:38 +0200 (CEST)
To: Proxmox Backup Server development discussion
 <pbs-devel@lists.proxmox.com>, Dominik Csapak <d.csapak@proxmox.com>
References: <20210720085511.1767928-1-d.csapak@proxmox.com>
From: Dietmar Maurer <dietmar@proxmox.com>
Message-ID: <2439dcf3-cf0c-4069-6191-c934c35f00b1@proxmox.com>
Date: Wed, 28 Jul 2021 11:29:37 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.12.0
MIME-Version: 1.0
In-Reply-To: <20210720085511.1767928-1-d.csapak@proxmox.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Language: en-US
X-SPAM-LEVEL: Spam detection results:  0
 AWL 0.769 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] applied: [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
 <pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>, 
 <mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>, 
 <mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 28 Jul 2021 09:30:10 -0000

applied

On 7/20/21 10:55 AM, Dominik Csapak wrote:
> 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 <d.csapak@proxmox.com>
> ---
> 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(())
>   }
>