This is mostly in preparation for external qcow2 snapshot support.
For internal qcow2 snapshots, which currently are the only supported
variant, it is not possible to attach the snapshot only. If access to
that is required it will need to be handled differently, e.g. via a
FUSE/NBD export.
Signed-off-by: Fiona Ebner <f.eb...@proxmox.com>
---
New in v2.
src/PVE/Storage/ISCSIDirectPlugin.pm | 3 +++
src/PVE/Storage/Plugin.pm | 13 ++++++++++++-
src/PVE/Storage/RBDPlugin.pm | 2 ++
src/PVE/Storage/ZFSPlugin.pm | 3 +++
src/PVE/Storage/ZFSPoolPlugin.pm | 2 ++
5 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/src/PVE/Storage/ISCSIDirectPlugin.pm
b/src/PVE/Storage/ISCSIDirectPlugin.pm
index 8f25577..23e8a24 100644
--- a/src/PVE/Storage/ISCSIDirectPlugin.pm
+++ b/src/PVE/Storage/ISCSIDirectPlugin.pm
@@ -108,6 +108,9 @@ sub path {
sub qemu_blockdev_options {
my ($class, $scfg, $storeid, $volname, $options) = @_;
+ die "volume snapshot is not possible on iscsi device\n"
+ if $options->{'snapshot-name'};
+
my $lun = ($class->parse_volname($volname))[1];
return {
diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm
index 7fe1b17..54e39a9 100644
--- a/src/PVE/Storage/Plugin.pm
+++ b/src/PVE/Storage/Plugin.pm
@@ -1921,6 +1921,11 @@ A hash reference with additional options.
=over
+=item C<< $options->{'snapshot-name'} >>
+
+(optional) The snapshot name. Set when the associated snapshot should be
opened rather than the
+volume itself.
+
=item C<< $options->{hints} >>
A hash reference with hints indicating what the volume will be used for. This
can be safely ignored
@@ -1946,9 +1951,15 @@ sub qemu_blockdev_options {
my $blockdev = {};
- my ($path) = $class->filesystem_path($scfg, $volname);
+ my ($path) = $class->filesystem_path($scfg, $volname,
$options->{'snapshot-name'});
if ($path =~ m|^/|) {
+ # For qcow2 and qed the path of a snapshot will be the same, but it's
not possible to attach
+ # the snapshot alone.
+ my $format = ($class->parse_volname($volname))[6];
+ die "cannot attach only the snapshot of a '$format' image\n"
+ if $options->{'snapshot-name'} && ($format eq 'qcow2' || $format eq
'qed');
+
# The 'file' driver only works for regular files. The check below is
taken from
# block/file-posix.c:hdev_probe_device() in QEMU. Do not bother with
detecting 'host_cdrom'
# devices here, those are not managed by the storage layer.
diff --git a/src/PVE/Storage/RBDPlugin.pm b/src/PVE/Storage/RBDPlugin.pm
index 6fa0689..72bd7c8 100644
--- a/src/PVE/Storage/RBDPlugin.pm
+++ b/src/PVE/Storage/RBDPlugin.pm
@@ -500,6 +500,7 @@ sub qemu_blockdev_options {
my ($name) = ($class->parse_volname($volname))[1];
if ($scfg->{krbd}) {
+ $name .= '@'.$options->{'snapshot-name'} if $options->{'snapshot-name'};
my $rbd_dev_path = get_rbd_dev_path($scfg, $storeid, $name);
return { driver => 'host_device', filename => $rbd_dev_path };
}
@@ -510,6 +511,7 @@ sub qemu_blockdev_options {
image => "$name",
};
$blockdev->{namespace} = "$scfg->{namespace}" if
defined($scfg->{namespace});
+ $blockdev->{snapshot} = $options->{'snapshot-name'} if
$options->{'snapshot-name'};
$blockdev->{conf} = $cmd_option->{ceph_conf} if $cmd_option->{ceph_conf};
diff --git a/src/PVE/Storage/ZFSPlugin.pm b/src/PVE/Storage/ZFSPlugin.pm
index 1392781..963e860 100644
--- a/src/PVE/Storage/ZFSPlugin.pm
+++ b/src/PVE/Storage/ZFSPlugin.pm
@@ -250,6 +250,9 @@ sub path {
sub qemu_blockdev_options {
my ($class, $scfg, $storeid, $volname, $options) = @_;
+ die "direct access to snapshots not implemented\n"
+ if $options->{'snapshot-name'};
+
my $name = ($class->parse_volname($volname))[1];
my $guid = $class->zfs_get_lu_name($scfg, $name);
my $lun = $class->zfs_get_lun_number($scfg, $guid);
diff --git a/src/PVE/Storage/ZFSPoolPlugin.pm b/src/PVE/Storage/ZFSPoolPlugin.pm
index 302c965..cd01414 100644
--- a/src/PVE/Storage/ZFSPoolPlugin.pm
+++ b/src/PVE/Storage/ZFSPoolPlugin.pm
@@ -164,6 +164,8 @@ sub path {
sub qemu_blockdev_options {
my ($class, $scfg, $storeid, $volname, $options) = @_;
+ die "cannot attach only the snapshot of a zvol\n" if
$options->{'snapshot-name'};
+
my ($path) = $class->path($scfg, $volname, $storeid);
my $blockdev = { driver => 'host_device', filename => $path };
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
