--- Begin Message ---
for external snapshot, we simply use snap volname as src.
don't use internal snapshot option in the command line.
Signed-off-by: Alexandre Derumier <alexandre.derum...@groupe-cyllene.com>
---
PVE/QemuServer.pm | 4 ++-
test/run_qemu_img_convert_tests.pl | 44 ++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 534aa2df..53135894 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -8104,11 +8104,13 @@ sub qemu_img_convert {
my $dst_format = checked_volume_format($storecfg, $dst_volid);
my $dst_path = PVE::Storage::path($storecfg, $dst_volid);
my $dst_is_iscsi = ($dst_path =~ m|^iscsi://|);
+ my $support_qemu_snapshots =
PVE::Storage::volume_support_qemu_snapshot($storecfg, $src_volid);
my $cmd = [];
push @$cmd, '/usr/bin/qemu-img', 'convert', '-p', '-n';
push @$cmd, '-l', "snapshot.name=$snapname"
- if $snapname && $src_format && $src_format eq "qcow2";
+ if $snapname && $src_format eq 'qcow2' && $support_qemu_snapshots &&
$support_qemu_snapshots eq 'internal';
+
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);
diff --git a/test/run_qemu_img_convert_tests.pl
b/test/run_qemu_img_convert_tests.pl
index 0a622cd1..5f43d326 100755
--- a/test/run_qemu_img_convert_tests.pl
+++ b/test/run_qemu_img_convert_tests.pl
@@ -21,6 +21,15 @@ my $storage_config = {
type => "dir",
shared => 0,
},
+ localsnapext => {
+ content => {
+ images => 1,
+ },
+ path => "/var/lib/vz",
+ type => "dir",
+ snapext => 1,
+ shared => 0,
+ },
btrfs => {
content => {
images => 1,
@@ -61,6 +70,13 @@ my $storage_config = {
images => 1,
}
},
+ "lvm-store" => {
+ vgname => "pve",
+ type => "lvm",
+ content => {
+ images => 1,
+ }
+ },
"zfs-over-iscsi" => {
type => "zfs",
iscsiprovider => "LIO",
@@ -308,6 +324,34 @@ my $tests = [
"/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
]
},
+ {
+ name => "qcow2_external_snapshot",
+ parameters => [
+ "localsnapext:$vmid/vm-$vmid-disk-0.qcow2",
+ "local:$vmid/vm-$vmid-disk-0.raw",
+ 1024*10,
+ { snapname => 'foo' },
+ ],
+ expected => [
+ "/usr/bin/qemu-img", "convert", "-p", "-n", "-f", "qcow2", "-O",
"raw",
+ "/var/lib/vz/images/$vmid/snap-foo-vm-$vmid-disk-0.qcow2",
+ "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
+ ]
+ },
+ {
+ name => "lvmqcow2_external_snapshot",
+ parameters => [
+ "lvm-store:vm-$vmid-disk-0.qcow2",
+ "local:$vmid/vm-$vmid-disk-0.raw",
+ 1024*10,
+ { snapname => 'foo' },
+ ],
+ expected => [
+ "/usr/bin/qemu-img", "convert", "-p", "-n", "-f", "qcow2", "-O",
"raw",
+ "/dev/pve/snap-foo-vm-$vmid-disk-0.qcow2",
+ "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
+ ]
+ },
];
my $command;
--
2.39.5
--- End Message ---
