From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH storage 6/6] plugins: volume import: align size up to 1KiB
Date: Fri, 13 Dec 2024 17:30:37 +0100 [thread overview]
Message-ID: <20241213163037.91508-7-f.ebner@proxmox.com> (raw)
In-Reply-To: <20241213163037.91508-1-f.ebner@proxmox.com>
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 <f.ebner@proxmox.com>
---
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 5deff76..94b3646 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 0e53888..8ce77eb 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 {
@@ -947,7 +949,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;
my $mapped;
eval {
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
prev parent reply other threads:[~2024-12-13 16:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-13 16:30 [pve-devel] [PATCH-SERIES storage 0/6] basic RBD import/export Fiona Ebner
2024-12-13 16:30 ` [pve-devel] [PATCH storage 1/6] rbd plugin: schema: document default value for 'krbd' setting Fiona Ebner
2024-12-13 16:30 ` [pve-devel] [PATCH storage 2/6] export: redirect stdout to avoid any unrelated messages ending up in the export stream Fiona Ebner
2024-12-13 16:30 ` [pve-devel] [PATCH storage 3/6] rbd plugin: factor out helper to check if volume already exists Fiona Ebner
2024-12-13 16:30 ` [pve-devel] [PATCH storage 4/6] rbd plugin: implement volume import/export Fiona Ebner
2024-12-13 16:34 ` Fiona Ebner
2024-12-17 12:10 ` Fiona Ebner
2024-12-13 16:30 ` [pve-devel] [PATCH storage 5/6] common: introduce common module Fiona Ebner
2024-12-13 16:30 ` Fiona Ebner [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241213163037.91508-7-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox