From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 8A0141FF17F for ; Sun, 8 Dec 2024 20:35:32 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 494C81CC27; Sun, 8 Dec 2024 20:35:35 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Sun, 8 Dec 2024 20:34:45 +0100 Message-Id: <20241208193445.37493-1-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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, create.rs] Subject: [pbs-devel] [PATCH proxmox-backup] pxar: client: fix missing file size check for metadata comparison 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Change detection mode set to metadata compares regular file entries metadata to the reference metadata archive of the previous run. The `pxar::format::Stat` as stored in `pxar::Metadata` however does not include the actual file size, it only partially stores information gathered from stating the file. This means however that the actual file size is never compared and therefore, that if the file size did change, but the other metadata information did not (including the mtime which might have been restored), that file will be incorrectly reused. A subsequent restore will however fail, because the expected file size as encoded in the metadata archive does not match the file size as stored in the payload archive. Fix this by adding the missing file size check, comparing the size for the given file against the one stored in the metadata archive. Link to issue reported in community forum: https://forum.proxmox.com/threads/158722/ Signed-off-by: Christian Ebner --- pbs-client/src/pxar/create.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs index c7d274b8c..33a4c29e6 100644 --- a/pbs-client/src/pxar/create.rs +++ b/pbs-client/src/pxar/create.rs @@ -423,6 +423,7 @@ impl Archiver { previous_metadata_accessor: &Option>, file_name: &Path, metadata: &Metadata, + file_size: u64, ) -> Result>, Error> { if let Some(previous_metadata_accessor) = previous_metadata_accessor { if let Some(file_entry) = previous_metadata_accessor.lookup(file_name).await? { @@ -433,6 +434,9 @@ impl Archiver { .. } = file_entry.entry().kind() { + if file_size != *size { + return Ok(None); + } let range = *offset..*offset + size + size_of::() as u64; debug!( @@ -798,8 +802,9 @@ impl Archiver { } let file_name: &Path = OsStr::from_bytes(c_file_name.to_bytes()).as_ref(); + let file_size = stat.st_size as u64; if let Some(payload_range) = self - .is_reusable_entry(previous_metadata, file_name, &metadata) + .is_reusable_entry(previous_metadata, file_name, &metadata, file_size) .await? { if !self.cache.try_extend_range(payload_range.clone()) { -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel