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 BEA8B9AE49 for ; Mon, 16 Oct 2023 14:00:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9C0BA17619 for ; Mon, 16 Oct 2023 14:00:03 +0200 (CEST) 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 ; Mon, 16 Oct 2023 13:59:59 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A7A8A413FA for ; Mon, 16 Oct 2023 13:59:59 +0200 (CEST) From: Hannes Duerr To: pve-devel@lists.proxmox.com Date: Mon, 16 Oct 2023 13:59:20 +0200 Message-Id: <20231016115920.95859-1-h.duerr@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 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: [pve-devel] [PATCH pve-storage] 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: Mon, 16 Oct 2023 12:00:33 -0000 if a base-image is to be migrated to a lvm-thin storage, a new vm-image is allocated on the target side, then the data is written and afterwards the image is converted to a base-image Signed-off-by: Hannes Duerr --- In the bugtracker wolfgang suggested two different approaches. In my opinion this approach is the cleaner one, but please let me know what you think src/PVE/Storage/LvmThinPlugin.pm | 65 ++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/src/PVE/Storage/LvmThinPlugin.pm b/src/PVE/Storage/LvmThinPlugin.pm index 1d2e37c..4579d47 100644 --- a/src/PVE/Storage/LvmThinPlugin.pm +++ b/src/PVE/Storage/LvmThinPlugin.pm @@ -383,6 +383,71 @@ 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 $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"; + $name = undef; + } + + my ($size) = PVE::Storage::Plugin::read_common_header($fh); + $size = int($size/1024); + + # Request new vm-name which is needed for the import + if ($isBase) { + my $newvmname = $class->find_free_diskname($storeid, $scfg, $vmid); + $name = $newvmname; + $volname = $newvmname; + } + + eval { + my $allocname = $class->alloc_image($storeid, $scfg, $vmid, 'raw', $name, $size); + my $oldname = $volname; + $volname = $allocname; + if (defined($name) && $allocname ne $oldname) { + die "internal error: unexpected allocated name: '$allocname' != '$oldname'\n"; + } + my $file = $class->path($scfg, $volname, $storeid) + or die "internal error: failed to get path to newly allocated volume $volname\n"; + + $class->volume_import_write($fh, $file); + }; + if (my $err = $@) { + my $cleanup_worker = eval { $class->free_image($storeid, $scfg, $volname, 0) }; + warn $@ if $@; + + if ($cleanup_worker) { + my $rpcenv = PVE::RPCEnvironment::get(); + my $authuser = $rpcenv->get_user(); + + $rpcenv->fork_worker('imgdel', undef, $authuser, $cleanup_worker); + } + + die $err; + } + + if ($isBase) { + my $newbasename = $class->create_base($storeid, $scfg, $volname); + $volname=$newbasename; + } + + return "$storeid:$volname"; +} + # used in LVMPlugin->volume_import sub volume_import_write { my ($class, $input_fh, $output_file) = @_; -- 2.39.2