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 A14261FF37F for ; Thu, 18 Apr 2024 11:49:06 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DEA1518CE2; Thu, 18 Apr 2024 11:49:05 +0200 (CEST) Message-ID: <9a365c98-11df-49a5-b608-65066d176f25@proxmox.com> Date: Thu, 18 Apr 2024 11:48:32 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta To: Fiona Ebner , Proxmox VE development discussion References: <20240416131909.2867605-1-d.csapak@proxmox.com> <20240416131909.2867605-13-d.csapak@proxmox.com> Content-Language: en-US From: Dominik Csapak In-Reply-To: X-SPAM-LEVEL: Spam detection results: 0 AWL 0.014 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 Subject: Re: [pve-devel] [PATCH qemu-server 3/3] api: create: implement extracting disks when needed for import-from 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" On 4/18/24 11:41, Fiona Ebner wrote: > Am 16.04.24 um 15:19 schrieb Dominik Csapak: >> @@ -391,6 +392,13 @@ my sub create_disks : prototype($$$$$$$$$$) { >> >> $needs_creation = $live_import; >> >> + if (PVE::Storage::copy_needs_extraction($source)) { # needs extraction beforehand >> + print "extracting $source\n"; >> + $source = PVE::Storage::extract_disk_from_import_file($source, $vmid); >> + print "finished extracting to $source\n"; >> + push @$delete_sources, $source; >> + } >> + > > This breaks import from an absolute path: copy_needs_extraction() > expects to be called with a PVE-managed volid, so the above should be > moved into the if below. true, that will be fixed in the next iteration since we then get a pve managed volid back after extraction (see my answer to the cover letter) > >> if (PVE::Storage::parse_volume_id($source, 1)) { # PVE-managed volume >> if ($live_import && $ds ne 'efidisk0') { >> my $path = PVE::Storage::path($storecfg, $source) >> @@ -514,13 +522,14 @@ my sub create_disks : prototype($$$$$$$$$$) { >> eval { PVE::Storage::vdisk_free($storecfg, $volid); }; >> warn $@ if $@; >> } >> + PVE::QemuServer::Helpers::cleanup_extracted_images($delete_sources); >> die $err; >> } >> >> # don't return empty import mappings >> $live_import_mapping = undef if !%$live_import_mapping; >> >> - return ($vollist, $res, $live_import_mapping); >> + return ($vollist, $res, $live_import_mapping, $delete_sources); >> }; >> >> my $check_cpu_model_access = sub { > > The second caller of create_disks(), i.e. when updating an existing VM, > is not updated to handle $delete_sources. (You can also do a disk > import-from from an OVA for an existing VM). > > When I tested that my suspicion is correct I didn't notice initially > that the temporary dirs were hidden, should we really make them so hard > to find? see my recent answer to the cover letter, this shouldn't be an issue when we put the extracted image into a valid image path on the storage _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel