From: Alexandre Derumier via pve-devel <pve-devel@lists.proxmox.com>
To: pve-devel@lists.proxmox.com
Cc: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com>
Subject: [pve-devel] [PATCH v2 qemu-server 1/1] implement external snapshot
Date: Mon, 30 Sep 2024 13:31:52 +0200 [thread overview]
Message-ID: <mailman.144.1727695956.332.pve-devel@lists.proxmox.com> (raw)
In-Reply-To: <20240930113153.2896648-1-alexandre.derumier@groupe-cyllene.com>
[-- Attachment #1: Type: message/rfc822, Size: 8987 bytes --]
From: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH v2 qemu-server 1/1] implement external snapshot
Date: Mon, 30 Sep 2024 13:31:52 +0200
Message-ID: <20240930113153.2896648-3-alexandre.derumier@groupe-cyllene.com>
Signed-off-by: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com>
---
PVE/QemuServer.pm | 108 ++++++++++++++++++++++++++++++++++++++++------
1 file changed, 95 insertions(+), 13 deletions(-)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index b26da505..1523df15 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -1549,7 +1549,11 @@ sub print_drive_commandline_full {
} else {
if ($storeid) {
$path = PVE::Storage::path($storecfg, $volid);
- $format //= qemu_img_format($scfg, $volname);
+ if ($scfg->{snapext}) {
+ $format //= qemu_img_format($scfg, $path);
+ } else {
+ $format //= qemu_img_format($scfg, $volname);
+ }
} else {
$path = $volid;
$format //= "raw";
@@ -4713,9 +4717,31 @@ sub qemu_volume_snapshot {
my ($vmid, $deviceid, $storecfg, $volid, $snap) = @_;
my $running = check_running($vmid);
+ my $do_snapshots_with_qemu = do_snapshots_with_qemu($storecfg, $volid, $deviceid) if $running;
+ if ($do_snapshots_with_qemu) {
+ if($do_snapshots_with_qemu == 2) {
+ my $snapshot_file = PVE::Storage::path($storecfg, $volid, $snap);
+ #allocate volume is external snapshot is a block device
+ my $snap_volid = undef;
+ if ($snapshot_file =~ m|^/dev/.+|) {
+ my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
+ my $size = PVE::Storage::volume_size_info($storecfg, $volid, 5);
+ #add 100M for qcow2 headers
+ $size = int($size/1024) + (100*1024);
+ my $snap_volname = $volname."-snap-$snap";
+ $snap_volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, 'raw', $snap_volname, $size);
+ PVE::Storage::activate_volumes($storecfg, [$snap_volid]);
+ }
+
+ eval { mon_cmd($vmid, 'blockdev-snapshot-sync', device => $deviceid, 'snapshot-file' => $snapshot_file, format => 'qcow2') };
- if ($running && do_snapshots_with_qemu($storecfg, $volid, $deviceid)) {
- mon_cmd($vmid, 'blockdev-snapshot-internal-sync', device => $deviceid, name => $snap);
+ if ($@) {
+ PVE::Storage::vdisk_free($storecfg, $snap_volid) if $snapshot_file =~ m|^/dev/.+|;
+ die $@;
+ }
+ } else {
+ mon_cmd($vmid, 'blockdev-snapshot-internal-sync', device => $deviceid, name => $snap);
+ }
} else {
PVE::Storage::volume_snapshot($storecfg, $volid, $snap);
}
@@ -4735,13 +4761,52 @@ sub qemu_volume_snapshot_delete {
});
}
- if ($attached_deviceid && do_snapshots_with_qemu($storecfg, $volid, $attached_deviceid)) {
- mon_cmd(
- $vmid,
- 'blockdev-snapshot-delete-internal-sync',
- device => $attached_deviceid,
- name => $snap,
- );
+ my $do_snapshots_with_qemu = do_snapshots_with_qemu($storecfg, $volid, $attached_deviceid) if $running;
+ if ($attached_deviceid && $do_snapshots_with_qemu) {
+
+ if ($do_snapshots_with_qemu == 2) {
+
+ my $snapshots = PVE::Storage::volume_snapshot_info($storecfg, $volid);
+
+ my $currentpath = $snapshots->{current}->{file};
+ my $snappath = $snapshots->{$snap}->{file};
+ my $snapvolid = $snapshots->{$snap}->{volid};
+ return if !$snappath; #already delete
+
+ my $parentsnap = $snapshots->{$snap}->{parent};
+ die "error: we can't find a parent for this snapshot" if !$parentsnap;
+
+ my $parentpath = $snapshots->{$parentsnap}->{file};
+ my $parentformat = $snapshots->{$parentsnap}->{'format'} if $parentsnap;
+
+ print "block-commit top:$snappath base:$parentpath\n";
+
+ my $job_id = "commit-$attached_deviceid";
+ my $jobs = {};
+ mon_cmd(
+ $vmid,
+ 'block-commit',
+ 'job-id' => $job_id,
+ device => $attached_deviceid,
+ top => $snappath,
+ base => $parentpath,
+ );
+ $jobs->{$job_id} = {};
+
+ #if we delete the current, block-job-complete to finish
+ my $completion = $currentpath eq $snappath ? 'complete' : 'auto';
+ qemu_drive_mirror_monitor($vmid, undef, $jobs, $completion, 0, 'commit');
+ #fixme. delete the disks when all jobs are ok ?
+ #delete the lvm volume
+ PVE::Storage::vdisk_free($storecfg, $snapvolid);
+ } else {
+ mon_cmd(
+ $vmid,
+ 'blockdev-snapshot-delete-internal-sync',
+ device => $attached_deviceid,
+ name => $snap,
+ );
+ }
} else {
PVE::Storage::volume_snapshot_delete(
$storecfg, $volid, $snap, $attached_deviceid ? 1 : undef);
@@ -7776,6 +7841,8 @@ sub do_snapshots_with_qemu {
return 1;
}
+ return 2 if $scfg->{snapext};
+
if ($volid =~ m/\.(qcow2|qed)$/){
return 1;
}
@@ -7849,8 +7916,23 @@ sub qemu_img_convert {
if ($src_storeid) {
PVE::Storage::activate_volumes($storecfg, [$src_volid], $snapname);
my $src_scfg = PVE::Storage::storage_config($storecfg, $src_storeid);
- $src_format = qemu_img_format($src_scfg, $src_volname);
- $src_path = PVE::Storage::path($storecfg, $src_volid, $snapname);
+ if($src_scfg->{snapext}) {
+ my $snapshots = PVE::Storage::volume_snapshot_info($storecfg, $src_volid);
+ $snapname = 'current' if !$snapname;
+ #if we don't clone the current image
+ #need to use the parent if available, as it's the readonly image view
+ #at the time of the snapshot
+ my $parentsnap = $snapshots->{$snapname}->{parent};
+ $snapname = $parentsnap if($parentsnap && $snapname ne 'current');
+ $src_format = $snapshots->{$snapname}->{format};
+ $src_path = $snapshots->{$snapname}->{file};
+ $src_volid = $snapshots->{$snapname}->{volid};
+ $snapname = undef;
+ PVE::Storage::activate_volumes($storecfg, [$src_volid], $snapname);
+ } else {
+ $src_format = qemu_img_format($src_scfg, $src_volname);
+ $src_path = PVE::Storage::path($storecfg, $src_volid, $snapname);
+ }
$src_is_iscsi = ($src_path =~ m|^iscsi://|);
$cachemode = 'none' if $src_scfg->{type} eq 'zfspool';
} elsif (-f $src_volid || -b $src_volid) {
@@ -7920,7 +8002,7 @@ sub qemu_img_format {
# FIXME: this entire function is kind of weird given that `parse_volname`
# also already gives us a format?
- my $is_path_storage = $scfg->{path} || $scfg->{type} eq 'esxi';
+ my $is_path_storage = $scfg->{path} || $scfg->{type} eq 'esxi' || $scfg->{snapext};
if ($is_path_storage && $volname =~ m/\.($PVE::QemuServer::Drive::QEMU_FORMAT_RE)$/) {
return $1;
--
2.39.2
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2024-09-30 11:32 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20240930113153.2896648-1-alexandre.derumier@groupe-cyllene.com>
2024-09-30 11:31 ` [pve-devel] [PATCH v2 pve-storage 1/2] add external snasphot support Alexandre Derumier via pve-devel
2024-10-23 10:12 ` Fabian Grünbichler
2024-10-23 12:59 ` DERUMIER, Alexandre via pve-devel
[not found] ` <f066c13a25b30e3107a9dec8091b456ce2852293.camel@groupe-cyllene.com>
2024-10-24 6:42 ` Fabian Grünbichler
2024-10-24 7:59 ` Giotta Simon RUAGH via pve-devel
2024-10-24 9:48 ` Fabian Grünbichler
2024-10-25 20:04 ` DERUMIER, Alexandre via pve-devel
[not found] ` <7974c74b2d3a85086e8eda76e52d7a2c58d1dcb9.camel@groupe-cyllene.com>
2024-10-28 11:12 ` Fabian Grünbichler
2024-10-25 5:52 ` DERUMIER, Alexandre via pve-devel
2024-10-24 7:50 ` Fabian Grünbichler
2024-09-30 11:31 ` Alexandre Derumier via pve-devel [this message]
2024-10-23 10:14 ` [pve-devel] [PATCH v2 qemu-server 1/1] implement external snapshot Fabian Grünbichler
2024-10-23 14:31 ` DERUMIER, Alexandre via pve-devel
2024-10-23 18:09 ` DERUMIER, Alexandre via pve-devel
[not found] ` <aeb9b8ea34826483eabe7fec5e2c12b1e22e132f.camel@groupe-cyllene.com>
2024-10-24 7:43 ` Fabian Grünbichler
2024-09-30 11:31 ` [pve-devel] [PATCH v2 pve-storage 2/2] add lvmqcow2 plugin: (lvm with external qcow2 snapshot) Alexandre Derumier via pve-devel
2024-10-23 10:13 ` Fabian Grünbichler
2024-10-23 13:45 ` DERUMIER, Alexandre via pve-devel
[not found] ` <e976104d8ed7c365d8a482fa320a0691456e69c1.camel@groupe-cyllene.com>
2024-10-24 7:42 ` Fabian Grünbichler
2024-10-24 11:01 ` DERUMIER, Alexandre via pve-devel
2024-10-20 13:03 ` [pve-devel] [PATCH SERIES v2 pve-storage/qemu-server] add external qcow2 snapshot support DERUMIER, Alexandre via pve-devel
2024-10-20 17:34 ` Roland privat via pve-devel
2024-10-20 19:08 ` Esi Y via pve-devel
[not found] ` <CABtLnHqZVhDKnog6jaUBP4HcSwfanyEzWeLdUXnzJs2esJQQkA@mail.gmail.com>
2024-10-22 6:39 ` Thomas Lamprecht
2024-10-22 9:51 ` Esi Y via pve-devel
2024-10-22 14:54 ` DERUMIER, Alexandre via pve-devel
[not found] ` <2f07646b51c85ffe01089c2481dbb9680d75cfcb.camel@groupe-cyllene.com>
2024-10-24 3:37 ` Esi Y via pve-devel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=mailman.144.1727695956.332.pve-devel@lists.proxmox.com \
--to=pve-devel@lists.proxmox.com \
--cc=alexandre.derumier@groupe-cyllene.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal