proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-08 04:14:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clone: use the zeroinit filter for sparseinit storages

Browse Source
This commit is contained in:
Wolfgang Bumiller 2016-03-18 12:20:33 +01:00 committed by Dietmar Maurer
parent c7c16256b4
commit 988e2714ad
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
PVE/QemuServer.pm
View File

@ -5802,7 +5802,7 @@ sub template_create {
} }
sub qemu_img_convert { sub qemu_img_convert {
my ($src_volid, $dst_volid, $size, $snapname) = @_; my ($src_volid, $dst_volid, $size, $snapname, $is_zero_initialized) = @_;
my $storecfg = PVE::Storage::config(); my $storecfg = PVE::Storage::config();
my ($src_storeid, $src_volname) = PVE::Storage::parse_volume_id($src_volid, 1); my ($src_storeid, $src_volname) = PVE::Storage::parse_volume_id($src_volid, 1);
@ -5824,7 +5824,12 @@ sub qemu_img_convert {
my $cmd = []; my $cmd = [];
push @$cmd, '/usr/bin/qemu-img', 'convert', '-t', 'writeback', '-p', '-n'; push @$cmd, '/usr/bin/qemu-img', 'convert', '-t', 'writeback', '-p', '-n';
push @$cmd, '-s', $snapname if($snapname && $src_format eq "qcow2"); push @$cmd, '-s', $snapname if($snapname && $src_format eq "qcow2");
push @$cmd, '-f', $src_format, '-O', $dst_format, $src_path, $dst_path; push @$cmd, '-f', $src_format, '-O', $dst_format, $src_path;
if ($is_zero_initialized) {
push @$cmd, "zeroinit:$dst_path";
} else {
push @$cmd, $dst_path;
}
my $parser = sub { my $parser = sub {
my $line = shift; my $line = shift;
@ -5855,7 +5860,7 @@ sub qemu_img_format {
} }
sub qemu_drive_mirror { sub qemu_drive_mirror {
my ($vmid, $drive, $dst_volid, $vmiddst) = @_; my ($vmid, $drive, $dst_volid, $vmiddst, $is_zero_initialized) = @_;
my $storecfg = PVE::Storage::config(); my $storecfg = PVE::Storage::config();
my ($dst_storeid, $dst_volname) = PVE::Storage::parse_volume_id($dst_volid); my ($dst_storeid, $dst_volname) = PVE::Storage::parse_volume_id($dst_volid);
@ -5866,7 +5871,9 @@ sub qemu_drive_mirror {
my $dst_path = PVE::Storage::path($storecfg, $dst_volid); my $dst_path = PVE::Storage::path($storecfg, $dst_volid);
my $opts = { timeout => 10, device => "drive-$drive", mode => "existing", sync => "full", target => $dst_path }; my $qemu_target = $is_zero_initialized ? "zeroinit:$dst_path" : $dst_path;
my $opts = { timeout => 10, device => "drive-$drive", mode => "existing", sync => "full", target => $qemu_target };
$opts->{format} = $format if $format; $opts->{format} = $format if $format;
print "drive mirror is starting (scanning bitmap) : this step can take some minutes/hours, depend of disk size and storage speed\n"; print "drive mirror is starting (scanning bitmap) : this step can take some minutes/hours, depend of disk size and storage speed\n";
@ -5960,10 +5967,11 @@ sub clone_disk {
PVE::Storage::activate_volumes($storecfg, $newvollist); PVE::Storage::activate_volumes($storecfg, $newvollist);
my $sparseinit = PVE::Storage::volume_has_feature($storecfg, 'sparseinit', $newvolid);
if (!$running || $snapname) { if (!$running || $snapname) {
qemu_img_convert($drive->{file}, $newvolid, $size, $snapname); qemu_img_convert($drive->{file}, $newvolid, $size, $snapname, $sparseinit);
} else { } else {
qemu_drive_mirror($vmid, $drivename, $newvolid, $newvmid); qemu_drive_mirror($vmid, $drivename, $newvolid, $newvmid, $sparseinit);
} }
} }