call volume_rollback_is_possible from PVE::Storage::volume_snapshot_rollback

That way it is automatically called for all plungins.

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index 7845ad174bde6b416e834c3085378a51c3bf5c41..1ab5786047590a87cd6ea5bc01bd86284e2d1ac6 100755 (executable)
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -181,6 +181,7 @@ sub volume_snapshot_rollback {
     if ($storeid) {
         my $scfg = storage_config($cfg, $storeid);
         my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
+       $plugin->volume_rollback_is_possible($scfg, $storeid, $volname, $snap);
         return $plugin->volume_snapshot_rollback($scfg, $storeid, $volname, $snap);
     } elsif ($volid =~ m|^(/.+)$| && -e $volid) {
         die "snapshot rollback device is not possible";

diff --git a/PVE/Storage/ZFSPlugin.pm b/PVE/Storage/ZFSPlugin.pm
index 6aac58d5aad8618841260cb588c86b9e637adb20..f02098569b2553d5e3259316b7d9c33cd749f7cd 100644 (file)
--- a/PVE/Storage/ZFSPlugin.pm
+++ b/PVE/Storage/ZFSPlugin.pm
@@ -310,9 +310,6 @@ sub volume_resize {
 sub volume_snapshot_rollback {
     my ($class, $scfg, $storeid, $volname, $snap) = @_;
 
-    # abort rollback if snapshot is not the latest
-    $class->volume_rollback_is_possible($scfg, $storeid, $volname, $snap);
-    
     $class->zfs_delete_lu($scfg, $volname);
 
     $class->zfs_request($class, $scfg, undef, 'rollback', "$scfg->{pool}/$volname\@$snap");

diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm
index 2a1cfef7dd94188912fd6dbe88ff7d564835b7ab..7dc7d3ef6a8e01a7af354c81e829bd65d615b188 100644 (file)
--- a/PVE/Storage/ZFSPoolPlugin.pm
+++ b/PVE/Storage/ZFSPoolPlugin.pm
@@ -411,9 +411,6 @@ sub volume_snapshot_delete {
 sub volume_snapshot_rollback {
     my ($class, $scfg, $storeid, $volname, $snap) = @_;
 
-    # abort rollback if snapshot is not the latest
-    $class->volume_rollback_is_possible($scfg, $storeid, $volname, $snap);
-
     zfs_request($class, $scfg, undef, 'rollback', "$scfg->{pool}/$volname\@$snap");
 }