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

zfs: move and refactor code

Browse Source 
copy and modify create_base and refactor clone_image

Signed-off-by: Wolfgang Link <w.link@proxmox.com>
This commit is contained in:
Wolfgang Link
2015-01-23 10:32:45 +01:00
committed by Dietmar Maurer
parent 2fc59177c9
commit d3a282e83e
2 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
PVE/Storage/ZFSDirPlugin.pm
View File

@ -429,6 +429,49 @@ sub deactivate_volume {
return 1;
}
sub clone_image {
my ($class, $scfg, $storeid, $volname, $vmid, $snap) = @_;
$snap ||= '__base__';
my ($vtype, $basename, $basevmid, undef, undef, $isBase) =
$class->parse_volname($volname);
die "clone_image only works on base images\n" if !$isBase;
my $name = $class->zfs_find_free_diskname($storeid, $scfg, $vmid);
warn "clone $volname: $basename to $name\n";
$class->zfs_request($scfg, undef, 'clone', "$scfg->{pool}/$basename\@$snap", "$scfg->{pool}/$name");
return $name;
}
sub create_base {
my ($class, $storeid, $scfg, $volname) = @_;
my $snap = '__base__';
my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =
$class->parse_volname($volname);
die "create_base not possible with base image\n" if $isBase;
my $newname = $name;
$newname =~ s/^vm-/base-/;
my $newvolname = $basename ? "$basename/$newname" : "$newname";
$class->zfs_request($scfg, undef, 'rename', "$scfg->{pool}/$name", "$scfg->{pool}/$newname");
my $running = undef; #fixme : is create_base always offline ?
$class->volume_snapshot($scfg, $storeid, $newname, $snap, $running);
return $newvolname;
}
sub volume_has_feature {
my ($class, $scfg, $feature, $storeid, $volname, $snapname, $running) = @_;

13
PVE/Storage/ZFSPlugin.pm
View File

@ -254,18 +254,7 @@ sub create_base {
sub clone_image {
my ($class, $scfg, $storeid, $volname, $vmid, $snap) = @_;
$snap ||= '__base__';
my ($vtype, $basename, $basevmid, undef, undef, $isBase) =
$class->parse_volname($volname);
die "clone_image only works on base images\n" if !$isBase;
my $name = $class->zfs_find_free_diskname($storeid, $scfg, $vmid);
warn "clone $volname: $basename to $name\n";
$class->zfs_request($scfg, undef, 'clone', "$scfg->{pool}/$basename\@$snap", "$scfg->{pool}/$name");
my $name = $class->SUPER::clone_image($scfg, $storeid, $volname, $vmid, $snap);
my $guid = $class->zfs_create_lu($scfg, $name);
$class->zfs_add_lun_mapping_entry($scfg, $name, $guid);