From 518f3908bf8f4556b694faa83440fd83e608f9ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Fri, 29 Nov 2019 13:30:30 +0100 Subject: [PATCH] rbd: update features of image when mapping snapshot MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit in order to fix the features even if the image itself never gets mapped. Signed-off-by: Fabian Grünbichler --- PVE/Storage/RBDPlugin.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm index 10b54e5..538d6bb 100644 --- a/PVE/Storage/RBDPlugin.pm +++ b/PVE/Storage/RBDPlugin.pm @@ -580,7 +580,9 @@ my $get_kernel_device_name = sub { sub map_volume { my ($class, $storeid, $scfg, $volname, $snapname) = @_; - my ($vtype, $name, $vmid) = $class->parse_volname($volname); + my ($vtype, $img_name, $vmid) = $class->parse_volname($volname); + + my $name = $img_name; $name .= '@'.$snapname if $snapname; my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd'; @@ -589,7 +591,8 @@ sub map_volume { return $kerneldev if -b $kerneldev; # already mapped - $krbd_feature_update->($scfg, $storeid, $name) if !$snapname; + # features can only be enabled/disabled for image, not for snapshot! + $krbd_feature_update->($scfg, $storeid, $img_name); my $cmd = &$rbd_cmd($scfg, $storeid, 'map', $name); run_rbd_command($cmd, errmsg => "can't map rbd volume $name");