From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 E13A5B8F89 for ; Thu, 7 Dec 2023 10:12:59 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id ADEABB954 for ; Thu, 7 Dec 2023 10:12:29 +0100 (CET) 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 for ; Thu, 7 Dec 2023 10:12:28 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C01F9432DA for ; Thu, 7 Dec 2023 10:12:28 +0100 (CET) From: Hannes Duerr To: pve-devel@lists.proxmox.com Date: Thu, 7 Dec 2023 10:12:03 +0100 Message-Id: <20231207091203.87763-3-h.duerr@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231207091203.87763-1-h.duerr@proxmox.com> References: <20231207091203.87763-1-h.duerr@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.001 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v2 qemu-server pve-storage 2/2] fix #1611: implement import of base-images for LVM-thin Storage X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2023 09:12:59 -0000 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 --- src/PVE/Storage/LvmThinPlugin.pm | 60 ++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/src/PVE/Storage/LvmThinPlugin.pm b/src/PVE/Storage/LvmThinPlugin.pm index 1d2e37c..6c95919 100644 --- a/src/PVE/Storage/LvmThinPlugin.pm +++ b/src/PVE/Storage/LvmThinPlugin.pm @@ -383,6 +383,66 @@ sub volume_has_feature { return undef; } +sub volume_import { + my ($class, $scfg, $storeid, $fh, $volname, $format, $snapshot, $base_snapshot, $with_snapshots, $allow_rename) = @_; + die "volume import format $format not available for $class\n" + if $format ne 'raw+size'; + die "cannot import volumes together with their snapshots in $class\n" + if $with_snapshots; + die "cannot import an incremental stream in $class\n" if defined($base_snapshot); + + my ($vtype, $name, $vmid, $basename, $basevmid, $isBase, $file_format) = + $class->parse_volname($volname); + die "cannot import format $format into a file of format $file_format\n" + if $file_format ne 'raw'; + + my $oldbasename; + if (!$isBase) { + ($storeid, $volname) = split (/:/, $class->SUPER::volume_import( + $scfg, + $storeid, + $fh, + $name, + $format, + $snapshot, + $base_snapshot, + $with_snapshots, + $allow_rename + )); + } else { + 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"; + + $volname = $class->find_free_diskname($storeid, $scfg, $vmid); + } else { + $oldbasename = $volname; + $volname =~ s/base/vm/; + } + + ($storeid, $volname) = split (/:/, $class->SUPER::volume_import( + $scfg, + $storeid, + $fh, + $volname, + $format, + $snapshot, + $base_snapshot, + $with_snapshots, + $allow_rename + )); + + $volname = $class->create_base($storeid, $scfg, $volname); + if ($oldbasename) { + $volname= $oldbasename; + } + } + + return "$storeid:$volname"; +} + # used in LVMPlugin->volume_import sub volume_import_write { my ($class, $input_fh, $output_file) = @_; -- 2.39.2