From: Hannes Duerr <h.duerr@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-storage v4 2/2] fix #1611: implement import of base-images for LVM-thin Storage
Date: Tue, 19 Dec 2023 15:03:06 +0100 [thread overview]
Message-ID: <20231219140306.188937-3-h.duerr@proxmox.com> (raw)
In-Reply-To: <20231219140306.188937-1-h.duerr@proxmox.com>
for base images we call the volume_import of the parent plugin and pass
it as vm-image instead of base-image, then convert it back as base-image
Signed-off-by: Hannes Duerr <h.duerr@proxmox.com>
---
src/PVE/Storage/LvmThinPlugin.pm | 50 ++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/src/PVE/Storage/LvmThinPlugin.pm b/src/PVE/Storage/LvmThinPlugin.pm
index 1d2e37c..96f619b 100644
--- a/src/PVE/Storage/LvmThinPlugin.pm
+++ b/src/PVE/Storage/LvmThinPlugin.pm
@@ -383,6 +383,56 @@ sub volume_has_feature {
return undef;
}
+sub volume_import {
+ my ($class, $scfg, $storeid, $fh, $volname, $format, $snapshot, $base_snapshot, $with_snapshots, $allow_rename) = @_;
+
+ my ($vtype, $name, $vmid, $basename, $basevmid, $isBase, $file_format) =
+ $class->parse_volname($volname);
+
+ if (!$isBase) {
+ return $class->SUPER::volume_import(
+ $scfg,
+ $storeid,
+ $fh,
+ $volname,
+ $format,
+ $snapshot,
+ $base_snapshot,
+ $with_snapshots,
+ $allow_rename
+ );
+ } else {
+ my $tempname;
+ my $vg = $scfg->{vgname};
+ my $lvs = PVE::Storage::LVMPlugin::lvm_list_volumes($vg);
+ if ($lvs->{$vg}->{$volname}) {
+ die "volume $vg/$volname already exists\n" if !$allow_rename;
+ warn "volume $vg/$volname already exists - importing with a different name\n";
+
+ $tempname = $class->find_free_diskname($storeid, $scfg, $vmid);
+ } else {
+ $tempname = $volname;
+ $tempname =~ s/base/vm/;
+ }
+
+ ($storeid,my $newname) = PVE::Storage::parse_volume_id($class->SUPER::volume_import(
+ $scfg,
+ $storeid,
+ $fh,
+ $tempname,
+ $format,
+ $snapshot,
+ $base_snapshot,
+ $with_snapshots,
+ $allow_rename
+ ));
+
+ $volname = $class->create_base($storeid, $scfg, $newname);
+ }
+
+ return "$storeid:$volname";
+}
+
# used in LVMPlugin->volume_import
sub volume_import_write {
my ($class, $input_fh, $output_file) = @_;
--
2.39.2
next prev parent reply other threads:[~2023-12-19 14:03 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-19 14:03 [pve-devel] [PATCH qemu-server/storage v4 0/2] " Hannes Duerr
2023-12-19 14:03 ` [pve-devel] [PATCH qemu-server v4 1/2] migration: secure and use source volume names for deactivation Hannes Duerr
2024-01-30 9:42 ` [pve-devel] applied: " Fabian Grünbichler
2023-12-19 14:03 ` Hannes Duerr [this message]
2023-12-19 14:10 ` [pve-devel] [PATCH pve-storage v4 2/2] fix #1611: implement import of base-images for LVM-thin Storage Lukas Wagner
2024-01-30 10:00 ` Fabian Grünbichler
2024-04-10 8:55 ` Hannes Dürr
2024-04-18 13:24 ` [pve-devel] applied: " Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231219140306.188937-3-h.duerr@proxmox.com \
--to=h.duerr@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox