yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

call volume_rollback_is_possible from PVE::Storage::volume_snapshot_rollback

Browse Source 
That way it is automatically called for all plungins.
This commit is contained in:
Dietmar Maurer
2015-02-12 09:28:52 +01:00
parent 1597f1f9ad
commit b3f302c638
3 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
PVE/Storage.pm
View File

@ -181,6 +181,7 @@ sub volume_snapshot_rollback {
if ($storeid) { if ($storeid) {
my $scfg = storage_config($cfg, $storeid); my $scfg = storage_config($cfg, $storeid);
my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); 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); return $plugin->volume_snapshot_rollback($scfg, $storeid, $volname, $snap);
} elsif ($volid =~ m|^(/.+)$| && -e $volid) { } elsif ($volid =~ m|^(/.+)$| && -e $volid) {
die "snapshot rollback device is not possible"; die "snapshot rollback device is not possible";

3
PVE/Storage/ZFSPlugin.pm
View File

@ -310,9 +310,6 @@ sub volume_resize {
sub volume_snapshot_rollback { sub volume_snapshot_rollback {
my ($class, $scfg, $storeid, $volname, $snap) = @_; 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_delete_lu($scfg, $volname);
$class->zfs_request($class, $scfg, undef, 'rollback', "$scfg->{pool}/$volname\@$snap"); $class->zfs_request($class, $scfg, undef, 'rollback', "$scfg->{pool}/$volname\@$snap");

3
PVE/Storage/ZFSPoolPlugin.pm
View File

@ -411,9 +411,6 @@ sub volume_snapshot_delete {
sub volume_snapshot_rollback { sub volume_snapshot_rollback {
my ($class, $scfg, $storeid, $volname, $snap) = @_; 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"); zfs_request($class, $scfg, undef, 'rollback', "$scfg->{pool}/$volname\@$snap");
} }