mirror of
https://git.proxmox.com/git/qemu-server
synced 2025-04-29 11:42:38 +00:00
fix #4249: make image clone or conversion respect bandwidth limit
Previously, cloning a stopped VM didn't respect bwlimit. Passing the -r (ratelimit) parameter to qemu-img convert fixes this issue. Signed-off-by: Leo Nunner <l.nunner@proxmox.com> [ T: reword subject line slightly ] Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Leo Nunner
Thomas Lamprecht
parent
62fdcfd4cf
commit
56d16f169c
@ -7661,7 +7661,7 @@ sub convert_iscsi_path {
|
||||
}
|
||||
|
||||
sub qemu_img_convert {
|
||||
my ($src_volid, $dst_volid, $size, $snapname, $is_zero_initialized) = @_;
|
||||
my ($src_volid, $dst_volid, $size, $snapname, $is_zero_initialized, $bwlimit) = @_;
|
||||
|
||||
my $storecfg = PVE::Storage::config();
|
||||
my ($src_storeid, $src_volname) = PVE::Storage::parse_volume_id($src_volid, 1);
|
||||
@ -7701,6 +7701,7 @@ sub qemu_img_convert {
|
||||
if $snapname && $src_format && $src_format eq "qcow2";
|
||||
push @$cmd, '-t', 'none' if $dst_scfg->{type} eq 'zfspool';
|
||||
push @$cmd, '-T', $cachemode if defined($cachemode);
|
||||
push @$cmd, '-r', "${bwlimit}K" if defined($bwlimit);
|
||||
|
||||
if ($src_is_iscsi) {
|
||||
push @$cmd, '--image-opts';
|
||||
@ -8109,7 +8110,7 @@ sub clone_disk {
|
||||
push $cmd->@*, "bs=$bs", "osize=$size", "if=$src_path", "of=$dst_path";
|
||||
run_command($cmd);
|
||||
} else {
|
||||
qemu_img_convert($drive->{file}, $newvolid, $size, $snapname, $sparseinit);
|
||||
qemu_img_convert($drive->{file}, $newvolid, $size, $snapname, $sparseinit, $bwlimit);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -55,7 +55,7 @@ my $storage_config = {
|
||||
my $tests = [
|
||||
{
|
||||
name => 'qcow2raw',
|
||||
parameters => [ "local:$vmid/vm-$vmid-disk-0.qcow2", "local:$vmid/vm-$vmid-disk-0.raw", 1024*10, undef, 0 ],
|
||||
parameters => [ "local:$vmid/vm-$vmid-disk-0.qcow2", "local:$vmid/vm-$vmid-disk-0.raw", 1024*10, undef, 0, undef ],
|
||||
expected => [
|
||||
"/usr/bin/qemu-img", "convert", "-p", "-n", "-f", "qcow2", "-O", "raw",
|
||||
"/var/lib/vz/images/$vmid/vm-$vmid-disk-0.qcow2", "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw"
|
||||
@ -63,7 +63,7 @@ my $tests = [
|
||||
},
|
||||
{
|
||||
name => "raw2qcow2",
|
||||
parameters => [ "local:$vmid/vm-$vmid-disk-0.raw", "local:$vmid/vm-$vmid-disk-0.qcow2", 1024*10, undef, 0 ],
|
||||
parameters => [ "local:$vmid/vm-$vmid-disk-0.raw", "local:$vmid/vm-$vmid-disk-0.qcow2", 1024*10, undef, 0, undef ],
|
||||
expected => [
|
||||
"/usr/bin/qemu-img", "convert", "-p", "-n", "-f", "raw", "-O", "qcow2",
|
||||
"/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw", "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.qcow2"
|
||||
@ -71,7 +71,7 @@ my $tests = [
|
||||
},
|
||||
{
|
||||
name => "local2rbd",
|
||||
parameters => [ "local:$vmid/vm-$vmid-disk-0.raw", "rbd-store:vm-$vmid-disk-0", 1024*10, undef, 0 ],
|
||||
parameters => [ "local:$vmid/vm-$vmid-disk-0.raw", "rbd-store:vm-$vmid-disk-0", 1024*10, undef, 0, undef ],
|
||||
expected => [
|
||||
"/usr/bin/qemu-img", "convert", "-p", "-n", "-f", "raw", "-O", "raw",
|
||||
"/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw", "rbd:cpool/vm-$vmid-disk-0:mon_host=127.0.0.42;127.0.0.21;[\\:\\:1]:auth_supported=none"
|
||||
@ -79,7 +79,7 @@ my $tests = [
|
||||
},
|
||||
{
|
||||
name => "rbd2local",
|
||||
parameters => [ "rbd-store:vm-$vmid-disk-0", "local:$vmid/vm-$vmid-disk-0.raw", 1024*10, undef, 0 ],
|
||||
parameters => [ "rbd-store:vm-$vmid-disk-0", "local:$vmid/vm-$vmid-disk-0.raw", 1024*10, undef, 0, undef ],
|
||||
expected => [
|
||||
"/usr/bin/qemu-img", "convert", "-p", "-n", "-f", "raw", "-O", "raw",
|
||||
"rbd:cpool/vm-$vmid-disk-0:mon_host=127.0.0.42;127.0.0.21;[\\:\\:1]:auth_supported=none", "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw"
|
||||
@ -87,7 +87,7 @@ my $tests = [
|
||||
},
|
||||
{
|
||||
name => "local2zos",
|
||||
parameters => [ "local:$vmid/vm-$vmid-disk-0.raw", "zfs-over-iscsi:vm-$vmid-disk-0", 1024*10, undef, 0 ],
|
||||
parameters => [ "local:$vmid/vm-$vmid-disk-0.raw", "zfs-over-iscsi:vm-$vmid-disk-0", 1024*10, undef, 0, undef ],
|
||||
expected => [
|
||||
"/usr/bin/qemu-img", "convert", "-p", "-n", "-f", "raw", "--target-image-opts",
|
||||
"/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
|
||||
@ -96,7 +96,7 @@ my $tests = [
|
||||
},
|
||||
{
|
||||
name => "zos2local",
|
||||
parameters => [ "zfs-over-iscsi:vm-$vmid-disk-0", "local:$vmid/vm-$vmid-disk-0.raw", 1024*10, undef, 0 ],
|
||||
parameters => [ "zfs-over-iscsi:vm-$vmid-disk-0", "local:$vmid/vm-$vmid-disk-0.raw", 1024*10, undef, 0, undef ],
|
||||
expected => [
|
||||
"/usr/bin/qemu-img", "convert", "-p", "-n", "--image-opts", "-O", "raw",
|
||||
"file.driver=iscsi,file.transport=tcp,file.initiator-name=foobar,file.portal=127.0.0.1,file.target=iqn.2019-10.org.test:foobar,file.lun=1,driver=raw",
|
||||
@ -105,7 +105,7 @@ my $tests = [
|
||||
},
|
||||
{
|
||||
name => "zos2rbd",
|
||||
parameters => [ "zfs-over-iscsi:vm-$vmid-disk-0", "rbd-store:vm-$vmid-disk-0", 1024*10, undef, 0 ],
|
||||
parameters => [ "zfs-over-iscsi:vm-$vmid-disk-0", "rbd-store:vm-$vmid-disk-0", 1024*10, undef, 0, undef ],
|
||||
expected => [
|
||||
"/usr/bin/qemu-img", "convert", "-p", "-n", "--image-opts", "-O", "raw",
|
||||
"file.driver=iscsi,file.transport=tcp,file.initiator-name=foobar,file.portal=127.0.0.1,file.target=iqn.2019-10.org.test:foobar,file.lun=1,driver=raw",
|
||||
@ -114,7 +114,7 @@ my $tests = [
|
||||
},
|
||||
{
|
||||
name => "rbd2zos",
|
||||
parameters => [ "rbd-store:vm-$vmid-disk-0", "zfs-over-iscsi:vm-$vmid-disk-0", 1024*10, undef, 0 ],
|
||||
parameters => [ "rbd-store:vm-$vmid-disk-0", "zfs-over-iscsi:vm-$vmid-disk-0", 1024*10, undef, 0, undef ],
|
||||
expected => [
|
||||
"/usr/bin/qemu-img", "convert", "-p", "-n", "-f", "raw", "--target-image-opts",
|
||||
"rbd:cpool/vm-$vmid-disk-0:mon_host=127.0.0.42;127.0.0.21;[\\:\\:1]:auth_supported=none",
|
||||
@ -123,7 +123,7 @@ my $tests = [
|
||||
},
|
||||
{
|
||||
name => "local2lvmthin",
|
||||
parameters => [ "local:$vmid/vm-$vmid-disk-0.raw", "local-lvm:vm-$vmid-disk-0", 1024*10, undef, 0 ],
|
||||
parameters => [ "local:$vmid/vm-$vmid-disk-0.raw", "local-lvm:vm-$vmid-disk-0", 1024*10, undef, 0, undef ],
|
||||
expected => [
|
||||
"/usr/bin/qemu-img", "convert", "-p", "-n", "-f", "raw", "-O", "raw",
|
||||
"/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
|
||||
@ -132,7 +132,7 @@ my $tests = [
|
||||
},
|
||||
{
|
||||
name => "lvmthin2local",
|
||||
parameters => [ "local-lvm:vm-$vmid-disk-0", "local:$vmid/vm-$vmid-disk-0.raw", 1024*10, undef, 0 ],
|
||||
parameters => [ "local-lvm:vm-$vmid-disk-0", "local:$vmid/vm-$vmid-disk-0.raw", 1024*10, undef, 0, undef ],
|
||||
expected => [
|
||||
"/usr/bin/qemu-img", "convert", "-p", "-n", "-f", "raw", "-O", "raw",
|
||||
"/dev/pve/vm-$vmid-disk-0",
|
||||
@ -141,7 +141,7 @@ my $tests = [
|
||||
},
|
||||
{
|
||||
name => "zeroinit",
|
||||
parameters => [ "local-lvm:vm-$vmid-disk-0", "local:$vmid/vm-$vmid-disk-0.raw", 1024*10, undef, 1 ],
|
||||
parameters => [ "local-lvm:vm-$vmid-disk-0", "local:$vmid/vm-$vmid-disk-0.raw", 1024*10, undef, 1, undef ],
|
||||
expected => [
|
||||
"/usr/bin/qemu-img", "convert", "-p", "-n", "-f", "raw", "-O", "raw",
|
||||
"/dev/pve/vm-$vmid-disk-0",
|
||||
@ -150,12 +150,12 @@ my $tests = [
|
||||
},
|
||||
{
|
||||
name => "notexistingstorage",
|
||||
parameters => [ "local-lvm:vm-$vmid-disk-0", "not-existing:$vmid/vm-$vmid-disk-0.raw", 1024*10, undef, 1 ],
|
||||
parameters => [ "local-lvm:vm-$vmid-disk-0", "not-existing:$vmid/vm-$vmid-disk-0.raw", 1024*10, undef, 1, undef ],
|
||||
expected => "storage 'not-existing' does not exist\n",
|
||||
},
|
||||
{
|
||||
name => "vmdkfile",
|
||||
parameters => [ "./test.vmdk", "local:$vmid/vm-$vmid-disk-0.raw", 1024*10, undef, 0 ],
|
||||
parameters => [ "./test.vmdk", "local:$vmid/vm-$vmid-disk-0.raw", 1024*10, undef, 0, undef ],
|
||||
expected => [
|
||||
"/usr/bin/qemu-img", "convert", "-p", "-n", "-f", "vmdk", "-O", "raw",
|
||||
"./test.vmdk",
|
||||
@ -164,12 +164,12 @@ my $tests = [
|
||||
},
|
||||
{
|
||||
name => "notexistingfile",
|
||||
parameters => [ "/foo/bar", "local:$vmid/vm-$vmid-disk-0.raw", 1024*10, undef, 0 ],
|
||||
parameters => [ "/foo/bar", "local:$vmid/vm-$vmid-disk-0.raw", 1024*10, undef, 0, undef ],
|
||||
expected => "source '/foo/bar' is not a valid volid nor path for qemu-img convert\n",
|
||||
},
|
||||
{
|
||||
name => "efidisk",
|
||||
parameters => [ "/usr/share/kvm/OVMF_VARS-pure-efi.fd", "local:$vmid/vm-$vmid-disk-0.raw", 1024*10, undef, 0 ],
|
||||
parameters => [ "/usr/share/kvm/OVMF_VARS-pure-efi.fd", "local:$vmid/vm-$vmid-disk-0.raw", 1024*10, undef, 0, undef ],
|
||||
expected => [
|
||||
"/usr/bin/qemu-img", "convert", "-p", "-n", "-O", "raw",
|
||||
"/usr/share/kvm/OVMF_VARS-pure-efi.fd",
|
||||
@ -178,13 +178,22 @@ my $tests = [
|
||||
},
|
||||
{
|
||||
name => "efi2zos",
|
||||
parameters => [ "/usr/share/kvm/OVMF_VARS-pure-efi.fd", "zfs-over-iscsi:vm-$vmid-disk-0", 1024*10, undef, 0 ],
|
||||
parameters => [ "/usr/share/kvm/OVMF_VARS-pure-efi.fd", "zfs-over-iscsi:vm-$vmid-disk-0", 1024*10, undef, 0, undef ],
|
||||
expected => [
|
||||
"/usr/bin/qemu-img", "convert", "-p", "-n", "--target-image-opts",
|
||||
"/usr/share/kvm/OVMF_VARS-pure-efi.fd",
|
||||
"file.driver=iscsi,file.transport=tcp,file.initiator-name=foobar,file.portal=127.0.0.1,file.target=iqn.2019-10.org.test:foobar,file.lun=1,driver=raw",
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
name => "bwlimit",
|
||||
parameters => [ "local-lvm:vm-$vmid-disk-0", "local:$vmid/vm-$vmid-disk-0.raw", 1024*10, undef, 0, 1024 ],
|
||||
expected => [
|
||||
"/usr/bin/qemu-img", "convert", "-p", "-n", "-r", "1024K", "-f", "raw", "-O", "raw",
|
||||
"/dev/pve/vm-$vmid-disk-0",
|
||||
"/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
|
||||
]
|
||||
},
|
||||
];
|
||||
|
||||
my $command;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user