From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 26C8D1FF38C for ; Thu, 16 May 2024 12:05:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CAE8B3469B; Thu, 16 May 2024 12:05:22 +0200 (CEST) Date: Thu, 16 May 2024 12:04:45 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20240515095513.1061658-1-d.csapak@proxmox.com> <20240515095513.1061658-3-d.csapak@proxmox.com> In-Reply-To: <20240515095513.1061658-3-d.csapak@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1715853068.1zxti5agca.astroid@yuna.none> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.054 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pbs-devel] [PATCH proxmox-backup 3/3] restore daemon: search disk also with truncated serial 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" On May 15, 2024 11:55 am, Dominik Csapak wrote: > the disk serial given to virtio disks only can be 20 characters, so > looking for a disk with a longer serial will always fail (like > 'drive-tpmstate0-backup'). If the serial is longer, also try with the > truncated one. Leave the first try in place in case the limit changes. as we discussed briefly off-list, I think it might also be a good idea to have a way to filter out images that we know are non-restorable. since this lives in PBS here, it would probably make most sense to pass this in somehow as an optional parameter? the filter would then need to be respected both when constructing the qemu commandline (we already skip archives not ending in '.img.fidx') and when listing the archives. then we could by default skip the efidisk and tpmstate, and any other such special volumes/archives that might end up being needed in the future.. > > Signed-off-by: Dominik Csapak > --- > .../src/proxmox_restore_daemon/disk.rs | 19 ++++++++++++++----- > 1 file changed, 14 insertions(+), 5 deletions(-) > > diff --git a/proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs b/proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs > index db96ced0b..4991479c2 100644 > --- a/proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs > +++ b/proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs > @@ -634,12 +634,21 @@ impl DiskState { > _ => bail!("no or invalid image in path"), > }; > > - let buckets = match self.disk_map.get_mut( > - req_fidx > - .strip_suffix(".img.fidx") > - .unwrap_or_else(|| req_fidx.as_ref()), > - ) { > + let serial = req_fidx > + .strip_suffix(".img.fidx") > + .unwrap_or_else(|| req_fidx.as_ref()); > + let buckets = match self.disk_map.get_mut(serial) { > Some(x) => x, > + None if serial.len() > 20 => { > + let (truncated_serial, _) = serial.split_at(20); > + eprintln!( > + "given image '{req_fidx}' not found with '{serial}', trying with '{truncated_serial}'." > + ); > + match self.disk_map.get_mut(truncated_serial) { > + Some(x) => x, > + None => bail!("given image '{req_fidx}' not found with '{truncated_serial}'"), > + } > + } as an alternative to this here, we could also use a (truncated) hash as the serial, and than map that back to the "readable" name. might make logging awkward though, unless we pro-actively hand the map to the restore daemon. and it might only really be relevant for custom usage of all of this, if we implement the filtering above ;) > None => bail!("given image '{req_fidx}' not found"), > }; > > -- > 2.39.2 > > > > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel > > > _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel