[pbs-devel] [PATCH proxmox-backup] file-restore: strip .img.fidx suffix from drive serials

[pbs-devel] [PATCH proxmox-backup] file-restore: strip .img.fidx suffix from drive serials

[Stefan Reiter]

Drive serials have a character limit of 20, longer names like
"drive-virtio0.img.fidx" or "drive-efidisk0.img.fidx" would get cut off.

Fix this by removing the suffix, it is not necessary to uniquely
identify an image.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
---
 src/bin/proxmox_file_restore/qemu_helper.rs | 3 ++-
 src/bin/proxmox_restore_daemon/disk.rs      | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/bin/proxmox_file_restore/qemu_helper.rs b/src/bin/proxmox_file_restore/qemu_helper.rs
index e50a8bbf..9328addf 100644
--- a/src/bin/proxmox_file_restore/qemu_helper.rs
+++ b/src/bin/proxmox_file_restore/qemu_helper.rs
@@ -201,7 +201,8 @@ pub async fn start_vm(
         ));
         drives.push("-device".to_owned());
         // drive serial is used by VM to map .fidx files to /dev paths
-        drives.push(format!("virtio-blk-pci,drive=drive{},serial={}", id, file));
+        let serial = file.strip_suffix(".img.fidx").unwrap_or(&file);
+        drives.push(format!("virtio-blk-pci,drive=drive{},serial={}", id, serial));
         id += 1;
     }
 
diff --git a/src/bin/proxmox_restore_daemon/disk.rs b/src/bin/proxmox_restore_daemon/disk.rs
index 08fe7490..0b564e42 100644
--- a/src/bin/proxmox_restore_daemon/disk.rs
+++ b/src/bin/proxmox_restore_daemon/disk.rs
@@ -268,7 +268,11 @@ impl DiskState {
             _ => bail!("no or invalid image in path"),
         };
 
-        let buckets = match self.disk_map.get_mut(req_fidx.as_ref()) {
+        let buckets = match self.disk_map.get_mut(
+            req_fidx
+                .strip_suffix(".img.fidx")
+                .unwrap_or_else(|| req_fidx.as_ref()),
+        ) {
             Some(x) => x,
             None => bail!("given image '{}' not found", req_fidx),
         };
-- 
2.20.1

[pbs-devel] applied: [PATCH proxmox-backup] file-restore: strip .img.fidx suffix from drive serials

[Thomas Lamprecht]

On 27.04.21 15:35, Stefan Reiter wrote:
> Drive serials have a character limit of 20, longer names like
> "drive-virtio0.img.fidx" or "drive-efidisk0.img.fidx" would get cut off.
> 
> Fix this by removing the suffix, it is not necessary to uniquely
> identify an image.
> 
> Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
> ---
>  src/bin/proxmox_file_restore/qemu_helper.rs | 3 ++-
>  src/bin/proxmox_restore_daemon/disk.rs      | 6 +++++-
>  2 files changed, 7 insertions(+), 2 deletions(-)
> 
>

applied, thanks!