From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 401871FF15E for <inbox@lore.proxmox.com>; Tue, 3 Jun 2025 09:58:19 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 969EB11570; Tue, 3 Jun 2025 09:56:54 +0200 (CEST) To: pve-devel@lists.proxmox.com Date: Tue, 3 Jun 2025 09:55:56 +0200 In-Reply-To: <20250603075558.627850-1-alexandre.derumier@groupe-cyllene.com> References: <20250603075558.627850-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Message-ID: <mailman.214.1748937413.395.pve-devel@lists.proxmox.com> List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Post: <mailto:pve-devel@lists.proxmox.com> From: Alexandre Derumier via pve-devel <pve-devel@lists.proxmox.com> Precedence: list Cc: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com> X-Mailman-Version: 2.1.29 X-BeenThere: pve-devel@lists.proxmox.com List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> Subject: [pve-devel] [PATCH qemu-server 11/13] qemu_img convert : add external snapshot support Content-Type: multipart/mixed; boundary="===============7628761105698016998==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> --===============7628761105698016998== Content-Type: message/rfc822 Content-Disposition: inline Return-Path: <root@formationkvm1.odiso.net> X-Original-To: pve-devel@lists.proxmox.com Delivered-To: pve-devel@lists.proxmox.com Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 41683CB70A for <pve-devel@lists.proxmox.com>; Tue, 3 Jun 2025 09:56:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C9DBB10C98 for <pve-devel@lists.proxmox.com>; Tue, 3 Jun 2025 09:56:19 +0200 (CEST) Received: from bastiontest.odiso.net (unknown [185.151.190.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for <pve-devel@lists.proxmox.com>; Tue, 3 Jun 2025 09:56:16 +0200 (CEST) Received: from formationkvm1.odiso.net (unknown [10.11.201.57]) by bastiontest.odiso.net (Postfix) with ESMTP id 732C1862E5B; Tue, 3 Jun 2025 09:56:02 +0200 (CEST) Received: by formationkvm1.odiso.net (Postfix, from userid 0) id A172A110DBD3; Tue, 3 Jun 2025 09:56:01 +0200 (CEST) From: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com> To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server 11/13] qemu_img convert : add external snapshot support Date: Tue, 3 Jun 2025 09:55:56 +0200 Message-Id: <20250603075558.627850-22-alexandre.derumier@groupe-cyllene.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250603075558.627850-1-alexandre.derumier@groupe-cyllene.com> References: <20250603075558.627850-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.035 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_NONE 0.1 DMARC none policy HEADER_FROM_DIFFERENT_DOMAINS 0.001 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_NONE 0.25 DKIM has Failed or SPF has failed on the message and the domain has no DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record 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.derumier@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 --===============7628761105698016998== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel --===============7628761105698016998==--