yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

helpers: make qemu_img* storage config independent

Browse Source 
by moving the preallocation handling to the call site, and preparing
them for taking further options like cluster size in the future.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Signed-off-by: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com>
This commit is contained in:
Fabian Grünbichler
2025-07-16 08:31:37 +02:00
committed by Wolfgang Bumiller
parent ea30d36da1
commit 06016db1cb
2 changed files with 48 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/PVE/Storage/LVMPlugin.pm
View File

@ -579,11 +579,14 @@ my sub lvm_qcow2_format {
$class->activate_volume($storeid, $scfg, $name); $class->activate_volume($storeid, $scfg, $name);
my $path = $class->path($scfg, $name, $storeid); my $path = $class->path($scfg, $name, $storeid);
my $options = {
preallocation => PVE::Storage::Plugin::preallocation_cmd_opt($scfg, $fmt),
};
if ($backing_snap) { if ($backing_snap) {
my $backing_path = $class->path($scfg, $name, $storeid, $backing_snap); my $backing_path = $class->path($scfg, $name, $storeid, $backing_snap);
PVE::Storage::Plugin::qemu_img_create_qcow2_backed($scfg, $path, $backing_path, $fmt); PVE::Storage::Plugin::qemu_img_create_qcow2_backed($path, $backing_path, $fmt, $options);
} else { } else {
PVE::Storage::Plugin::qemu_img_create($scfg, $fmt, $size, $path); PVE::Storage::Plugin::qemu_img_create($fmt, $size, $path, $options);
} }
} }
@ -868,7 +871,8 @@ sub volume_resize {
); );
if (!$running && $format eq 'qcow2') { if (!$running && $format eq 'qcow2') {
PVE::Storage::Plugin::qemu_img_resize($scfg, $path, $format, $size, 10); my $preallocation = PVE::Storage::Plugin::preallocation_cmd_opt($scfg, $fmt);
PVE::Storage::Plugin::qemu_img_resize($path, $format, $size, $preallocation, 10);
} }
return 1; return 1;

66
src/PVE/Storage/Plugin.pm
View File

@ -615,7 +615,7 @@ sub parse_config {
return $cfg; return $cfg;
} }
sub preallocation_cmd_option { sub preallocation_cmd_opt {
my ($scfg, $fmt) = @_; my ($scfg, $fmt) = @_;
my $prealloc = $scfg->{preallocation}; my $prealloc = $scfg->{preallocation};
@ -626,7 +626,7 @@ sub preallocation_cmd_option {
die "preallocation mode '$prealloc' not supported by format '$fmt'\n" die "preallocation mode '$prealloc' not supported by format '$fmt'\n"
if !$QCOW2_PREALLOCATION->{$prealloc}; if !$QCOW2_PREALLOCATION->{$prealloc};
return "preallocation=$prealloc"; return $prealloc;
} elsif ($fmt eq 'raw') { } elsif ($fmt eq 'raw') {
$prealloc = $prealloc // 'off'; $prealloc = $prealloc // 'off';
$prealloc = 'off' if $prealloc eq 'metadata'; $prealloc = 'off' if $prealloc eq 'metadata';
@ -634,7 +634,7 @@ sub preallocation_cmd_option {
die "preallocation mode '$prealloc' not supported by format '$fmt'\n" die "preallocation mode '$prealloc' not supported by format '$fmt'\n"
if !$RAW_PREALLOCATION->{$prealloc}; if !$RAW_PREALLOCATION->{$prealloc};
return "preallocation=$prealloc"; return $prealloc;
} }
return; return;
@ -644,19 +644,21 @@ sub preallocation_cmd_option {
=head3 qemu_img_create =head3 qemu_img_create
qemu_img_create($scfg, $fmt, $size, $path) qemu_img_create($fmt, $size, $path, $options)
Create a new qemu image with a specific format C<$format> and size C<$size> for a target C<$path>. Create a new qemu image with a specific format C<$format> and size C<$size> for a target C<$path>.
C<$options> currently allows setting the C<preallocation> value
=cut =cut
sub qemu_img_create { sub qemu_img_create {
my ($scfg, $fmt, $size, $path) = @_; my ($fmt, $size, $path, $options) = @_;
my $cmd = ['/usr/bin/qemu-img', 'create']; my $cmd = ['/usr/bin/qemu-img', 'create'];
my $prealloc_opt = preallocation_cmd_option($scfg, $fmt); push @$cmd, '-o', "preallocation=$options->{preallocation}"
push @$cmd, '-o', $prealloc_opt if defined($prealloc_opt); if defined($options->{preallocation});
push @$cmd, '-f', $fmt, $path, "${size}K"; push @$cmd, '-f', $fmt, $path, "${size}K";
@ -667,14 +669,16 @@ sub qemu_img_create {
=head3 qemu_img_create_qcow2_backed =head3 qemu_img_create_qcow2_backed
qemu_img_create_qcow2_backed($scfg, $path, $backing_path, $backing_format) qemu_img_create_qcow2_backed($path, $backing_path, $backing_format, $options)
Create a new qemu qcow2 image C<$path> using an existing backing image C<$backing_path> with backing_format C<$backing_format>. Create a new qemu qcow2 image C<$path> using an existing backing image C<$backing_path> with backing_format C<$backing_format>.
C<$options> currently allows setting the C<preallocation> value.
=cut =cut
sub qemu_img_create_qcow2_backed { sub qemu_img_create_qcow2_backed {
my ($scfg, $path, $backing_path, $backing_format) = @_; my ($path, $backing_path, $backing_format, $options) = @_;
my $cmd = [ my $cmd = [
'/usr/bin/qemu-img', '/usr/bin/qemu-img',
@ -688,10 +692,10 @@ sub qemu_img_create_qcow2_backed {
$path, $path,
]; ];
my $options = $QCOW2_CLUSTERS->{backed}; my $opts = $QCOW2_CLUSTERS->{backed};
push @$options, preallocation_cmd_option($scfg, 'qcow2'); push @$opts, $options->{preallocation} if defined($options->{preallocation});
push @$cmd, '-o', join(',', @$options) if @$options > 0; push @$cmd, '-o', join(',', @$opts) if @$opts > 0;
run_command($cmd, errmsg => "unable to create image"); run_command($cmd, errmsg => "unable to create image");
} }
@ -722,20 +726,21 @@ sub qemu_img_info {
=head3 qemu_img_measure =head3 qemu_img_measure
qemu_img_measure($size, $fmt, $timeout, $is_backed) qemu_img_measure($size, $fmt, $timeout, $options)
Returns a json with the maximum size including all metadatas overhead for an image with format C<$fmt> and original size C<$size>Kb. Returns a json with the maximum size including all metadatas overhead for an image with format C<$fmt> and original size C<$size>Kb.
If the image is backed C<$is_backed>, we use different cluster size informations.
C<$options> allows specifying qemu-img options that might affect the sizing calculation, such as cluster size.
=cut =cut
sub qemu_img_measure { sub qemu_img_measure {
my ($size, $fmt, $timeout, $is_backed) = @_; my ($size, $fmt, $timeout, $options) = @_;
die "format is missing" if !$fmt; die "format is missing" if !$fmt;
my $cmd = ['/usr/bin/qemu-img', 'measure', '--output=json', '--size', "${size}K", '-O', $fmt]; my $cmd = ['/usr/bin/qemu-img', 'measure', '--output=json', '--size', "${size}K", '-O', $fmt];
if ($is_backed) { if ($options) {
my $options = $QCOW2_CLUSTERS->{backed};
push $cmd->@*, '-o', join(',', @$options) if @$options > 0; push $cmd->@*, '-o', join(',', @$options) if @$options > 0;
} }
return PVE::Storage::Common::run_qemu_img_json($cmd, $timeout); return PVE::Storage::Common::run_qemu_img_json($cmd, $timeout);
@ -745,20 +750,21 @@ sub qemu_img_measure {
=head3 qemu_img_resize =head3 qemu_img_resize
qemu_img_resize($scfg, $path, $format, $size, $timeout) qemu_img_resize($scfg, $path, $format, $size, $preallocation, $timeout)
Resize a qemu image C<$path> with format C<$format> to a target Kb size C<$size>. Resize a qemu image C<$path> with format C<$format> to a target Kb size C<$size>.
Default timeout C<$timeout> is 10s if not specified. Default timeout C<$timeout> is 10s if not specified.
C<$preallocation> allows to specify the preallocation option for the resize operation.
=cut =cut
sub qemu_img_resize { sub qemu_img_resize {
my ($scfg, $path, $format, $size, $timeout) = @_; my ($scfg, $path, $format, $size, $preallocation, $timeout) = @_;
die "format is missing" if !$format; die "format is missing" if !$format;
my $prealloc_opt = preallocation_cmd_option($scfg, $format);
my $cmd = ['/usr/bin/qemu-img', 'resize']; my $cmd = ['/usr/bin/qemu-img', 'resize'];
push $cmd->@*, "--$prealloc_opt" if $prealloc_opt; push $cmd->@*, "--preallocation=$preallocation" if $preallocation;
push $cmd->@*, '-f', $format, $path, $size; push $cmd->@*, '-f', $format, $path, $size;
$timeout = 10 if !$timeout; $timeout = 10 if !$timeout;
@ -1067,7 +1073,10 @@ sub clone_image {
# Note: we use relative paths, so we need to call chdir before qemu-img # Note: we use relative paths, so we need to call chdir before qemu-img
eval { eval {
local $CWD = $imagedir; local $CWD = $imagedir;
qemu_img_create_qcow2_backed($scfg, $path, "../$basevmid/$basename", $format); my $options = {
preallocation => preallocation_cmd_opt($scfg, $format),
};
qemu_img_create_qcow2_backed($path, "../$basevmid/$basename", $format, $options);
}; };
my $err = $@; my $err = $@;
@ -1105,7 +1114,10 @@ sub alloc_image {
umask $old_umask; umask $old_umask;
die $err if $err; die $err if $err;
} else { } else {
eval { qemu_img_create($scfg, $fmt, $size, $path) }; my $preallocation = preallocation_cmd_opt($scfg, $fmt);
my $options = {};
$options->{preallocation} = $preallocation if $preallocation;
eval { qemu_img_create($fmt, $size, $path, $options) };
if ($@) { if ($@) {
unlink $path; unlink $path;
rmdir $imagedir; rmdir $imagedir;
@ -1122,9 +1134,12 @@ my sub alloc_backed_image {
my $path = $class->path($scfg, $volname, $storeid); my $path = $class->path($scfg, $volname, $storeid);
my ($vmid, $backing_format) = ($class->parse_volname($volname))[2, 6]; my ($vmid, $backing_format) = ($class->parse_volname($volname))[2, 6];
my $preallocation = preallocation_cmd_opt($scfg, $backing_format);
my $options = {};
$options->{preallocation} = $preallocation if $preallocation;
my $backing_volname = get_snap_name($class, $volname, $backing_snap); my $backing_volname = get_snap_name($class, $volname, $backing_snap);
#qemu_img use relative path from base image for the backing_volname by default #qemu_img use relative path from base image for the backing_volname by default
eval { qemu_img_create_qcow2_backed($scfg, $path, $backing_volname, $backing_format) }; eval { qemu_img_create_qcow2_backed($path, $backing_volname, $backing_format, $options) };
if ($@) { if ($@) {
unlink $path; unlink $path;
die "$@"; die "$@";
@ -1371,7 +1386,8 @@ sub volume_resize {
my $format = ($class->parse_volname($volname))[6]; my $format = ($class->parse_volname($volname))[6];
qemu_img_resize($scfg, $path, $format, $size, 10); my $preallocation = preallocation_cmd_opt($scfg, $format);
qemu_img_resize($path, $format, $size, $preallocation, 10);
return undef; return undef;
} }