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 42B10BBD81 for ; Tue, 19 Dec 2023 15:10:27 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 24269A08 for ; Tue, 19 Dec 2023 15:10:27 +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 ; Tue, 19 Dec 2023 15:10:26 +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 657A6484C9 for ; Tue, 19 Dec 2023 15:10:26 +0100 (CET) Message-ID: <97bb9cd4-0a2b-4c0f-bc3d-3ef598df9027@proxmox.com> Date: Tue, 19 Dec 2023 15:10:25 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: de-AT, en-US To: Proxmox VE development discussion , Hannes Duerr References: <20231219140306.188937-1-h.duerr@proxmox.com> <20231219140306.188937-3-h.duerr@proxmox.com> From: Lukas Wagner In-Reply-To: <20231219140306.188937-3-h.duerr@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.004 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [lvmthinplugin.pm] Subject: Re: [pve-devel] [PATCH pve-storage v4 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: Tue, 19 Dec 2023 14:10:27 -0000 On 12/19/23 15:03, Hannes Duerr wrote: > 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 | 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) = ^ Nit: camelCase :) > + $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) = @_; -- - Lukas