From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 695121FF163 for ; Thu, 19 Dec 2024 11:43:27 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E9DE3D28; Thu, 19 Dec 2024 11:43:22 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 19 Dec 2024 11:43:04 +0100 Message-Id: <20241219104316.35329-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241219104316.35329-1-f.ebner@proxmox.com> References: <20241219104316.35329-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.054 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 storage v3 01/13] plugin: export/import: fix calls to path() method 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" The plugin API does not require call context detection for the returned value of the path() method. See other plugins like ISCSIDirect/ZFS that do not implement it. So do not expect it for external plugins either. Signed-off-by: Fiona Ebner --- New in v3. src/PVE/Storage/Plugin.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm index 5deff76..92609ad 100644 --- a/src/PVE/Storage/Plugin.pm +++ b/src/PVE/Storage/Plugin.pm @@ -1697,7 +1697,7 @@ sub volume_export { my $err_msg = "volume export format $format not available for $class\n"; if ($scfg->{path} && !defined($snapshot) && !defined($base_snapshot)) { - my $file = $class->path($scfg, $volname, $storeid) or die $err_msg; + my ($file) = $class->path($scfg, $volname, $storeid) or die $err_msg; my $file_format = ($class->parse_volname($volname))[6]; my $size = file_size_info($file, undef, $file_format); @@ -1731,7 +1731,7 @@ sub volume_export { sub volume_export_formats { my ($class, $scfg, $storeid, $volname, $snapshot, $base_snapshot, $with_snapshots) = @_; if ($scfg->{path} && !defined($snapshot) && !defined($base_snapshot)) { - my $file = $class->path($scfg, $volname, $storeid) + my ($file) = $class->path($scfg, $volname, $storeid) or return; my $format = ($class->parse_volname($volname))[6]; my $size = file_size_info($file, undef, $format); @@ -1769,7 +1769,7 @@ sub volume_import { # Check for an existing file first since interrupting alloc_image doesn't # free it. - my $file = $class->path($scfg, $volname, $storeid); + my ($file) = $class->path($scfg, $volname, $storeid); if (-e $file) { die "file '$file' already exists\n" if !$allow_rename; warn "file '$file' already exists - importing with a different name\n"; @@ -1786,7 +1786,7 @@ sub volume_import { if (defined($name) && $allocname ne $oldname) { die "internal error: unexpected allocated name: '$allocname' != '$oldname'\n"; } - my $file = $class->path($scfg, $volname, $storeid) + my ($file) = $class->path($scfg, $volname, $storeid) or die "internal error: failed to get path to newly allocated volume $volname\n"; if ($data_format eq 'raw' || $data_format eq 'qcow2' || $data_format eq 'vmdk') { run_command(['dd', "of=$file", 'conv=sparse', 'bs=64k'], -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel