Proxmox/pve-storage
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-storage.git synced 2025-01-26 10:03:52 +03:00
Code Releases Activity

Fixed ZFS over iSCSI snapshot rollback

Browse Source 
I converted several zfs_request($class, ...) calls to $class->zfs_request(...) calls in ZFSPoolPlugin.pm and removed a superfluous $class parameter in ZFSPlugin.pm.

Fixes #816

Signed-off-by: Phillip Schichtel <phillip.public@schich.tel>
This commit is contained in:
Phillip Schichtel 2015-11-12 20:00:37 +01:00 committed by Dietmar Maurer
parent 2275d75fb9
commit 281f958706
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/Storage/ZFSPlugin.pm
View File

@ -323,7 +323,7 @@ sub volume_snapshot_rollback {
$class->zfs_delete_lu($scfg, $volname);
$class->zfs_request($class, $scfg, undef, 'rollback', "$scfg->{pool}/$volname\@$snap");
$class->zfs_request($scfg, undef, 'rollback', "$scfg->{pool}/$volname\@$snap");
$class->zfs_import_lu($scfg, $volname);

6
PVE/Storage/ZFSPoolPlugin.pm
View File

@ -404,7 +404,7 @@ sub zfs_get_latest_snapshot {
# abort rollback if snapshot is not the latest
my @params = ('-t', 'snapshot', '-o', 'name', '-s', 'creation');
my $text = zfs_request($class, $scfg, undef, 'list', @params);
my $text = $class->zfs_request($scfg, undef, 'list', @params);
my @snapshots = split(/\n/, $text);
my $recentsnap;
@ -468,7 +468,7 @@ sub volume_snapshot_delete {
sub volume_snapshot_rollback {
my ($class, $scfg, $storeid, $volname, $snap) = @_;
zfs_request($class, $scfg, undef, 'rollback', "$scfg->{pool}/$volname\@$snap");
$class->zfs_request($scfg, undef, 'rollback', "$scfg->{pool}/$volname\@$snap");
}
sub volume_rollback_is_possible {
@ -487,7 +487,7 @@ sub activate_storage {
my @param = ('-o', 'name', '-H');
my $text = zfs_request($class, $scfg, undef, 'zpool_list', @param);
my $text = $class->zfs_request($scfg, undef, 'zpool_list', @param);
# Note: $scfg->{pool} can include dataset <pool>/<dataset>
my $pool = $scfg->{pool};