From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id C4E821FF37F for ; Thu, 18 Apr 2024 15:24:46 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 861D91D315; Thu, 18 Apr 2024 15:24:46 +0200 (CEST) Date: Thu, 18 Apr 2024 15:24:08 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20231219140306.188937-1-h.duerr@proxmox.com> <20231219140306.188937-3-h.duerr@proxmox.com> In-Reply-To: <20231219140306.188937-3-h.duerr@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1713446578.hk60jigv1s.astroid@yuna.none> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.055 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 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, proxmox.com] Subject: [pve-devel] applied: [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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" with a small style follow-up, thanks! create_base prints a warning (before this patch as well): > WARNING: Combining activation change with other commands is not advised. maybe we could get rid of that one? I guess it doesn't like `-an` combined with other stuff.. On December 19, 2023 3:03 pm, 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) = > + $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 > > > > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel > > > _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel