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 583B91FF163 for ; Thu, 19 Dec 2024 11:44:45 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0E5AF19D8; Thu, 19 Dec 2024 11:43:58 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 19 Dec 2024 11:43:13 +0100 Message-Id: <20241219104316.35329-11-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.052 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: [pve-devel] [PATCH storage v3 10/13] plugins: volume import: align size up to 1KiB 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" Previously, the size was rounded down which, in case of an image with non-1KiB-aligned sze (only possible for external plugins or manually created images) would lead to errors when attempting to write beyond the end of the too small allocated target image. For image allocation, the size is already rounded up to the granularity of the storage. Do the same for import. Signed-off-by: Fiona Ebner --- src/PVE/Storage/LVMPlugin.pm | 4 +++- src/PVE/Storage/Plugin.pm | 4 +++- src/PVE/Storage/RBDPlugin.pm | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/PVE/Storage/LVMPlugin.pm b/src/PVE/Storage/LVMPlugin.pm index 88fd612..38f7fa1 100644 --- a/src/PVE/Storage/LVMPlugin.pm +++ b/src/PVE/Storage/LVMPlugin.pm @@ -9,6 +9,8 @@ use PVE::Tools qw(run_command trim); use PVE::Storage::Plugin; use PVE::JSONSchema qw(get_standard_option); +use PVE::Storage::Common; + use base qw(PVE::Storage::Plugin); # lvm helper functions @@ -677,7 +679,7 @@ sub volume_import { } my ($size) = PVE::Storage::Plugin::read_common_header($fh); - $size = int($size/1024); + $size = PVE::Storage::Common::align_size_up($size, 1024) / 1024; eval { my $allocname = $class->alloc_image($storeid, $scfg, $vmid, 'raw', $name, $size); diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm index 92609ad..65cf43f 100644 --- a/src/PVE/Storage/Plugin.pm +++ b/src/PVE/Storage/Plugin.pm @@ -15,6 +15,8 @@ use PVE::Tools qw(run_command); use PVE::JSONSchema qw(get_standard_option register_standard_option); use PVE::Cluster qw(cfs_register_file); +use PVE::Storage::Common; + use JSON; use base qw(PVE::SectionConfig); @@ -1777,7 +1779,7 @@ sub volume_import { } my ($size) = read_common_header($fh); - $size = int($size/1024); + $size = PVE::Storage::Common::align_size_up($size, 1024) / 1024; eval { my $allocname = $class->alloc_image($storeid, $scfg, $vmid, $file_format, $name, $size); diff --git a/src/PVE/Storage/RBDPlugin.pm b/src/PVE/Storage/RBDPlugin.pm index 1d1cfad..a362529 100644 --- a/src/PVE/Storage/RBDPlugin.pm +++ b/src/PVE/Storage/RBDPlugin.pm @@ -18,6 +18,8 @@ use PVE::RPCEnvironment; use PVE::Storage::Plugin; use PVE::Tools qw(run_command trim file_read_firstline); +use PVE::Storage::Common; + use base qw(PVE::Storage::Plugin); my $get_parent_image_name = sub { @@ -955,7 +957,7 @@ sub volume_import { } my ($size) = PVE::Storage::Plugin::read_common_header($fh); - $size = int($size/1024); + $size = PVE::Storage::Common::align_size_up($size, 1024) / 1024; eval { my $cmd = $rbd_cmd->($scfg, $storeid, 'import', '--export-format', '1', '-', $volname); -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel