X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=PVE%2FStorage%2FPlugin.pm;h=6741fecf2bf8690cedf7eb070e00859f608ebe8e;hb=1689e627a698a21404f6912b7f94e918b00a8831;hp=908c6c3402d43cba219ba49a88db498c369bdada;hpb=b345cad347a12be35926a0379d29390f1fff2993;p=pve-storage.git diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm index 908c6c3..6741fec 100644 --- a/PVE/Storage/Plugin.pm +++ b/PVE/Storage/Plugin.pm @@ -2,6 +2,7 @@ package PVE::Storage::Plugin; use strict; use warnings; +use File::chdir; use File::Path; use PVE::Tools qw(run_command); use PVE::JSONSchema qw(get_standard_option); @@ -11,17 +12,18 @@ use Data::Dumper; use base qw(PVE::SectionConfig); -cfs_register_file ('storage.cfg', +cfs_register_file ('storage.cfg', sub { __PACKAGE__->parse_config(@_); }, sub { __PACKAGE__->write_config(@_); }); + my $defaultData = { propertyList => { type => { description => "Storage type." }, storage => get_standard_option('pve-storage-id'), nodes => get_standard_option('pve-node-list', { optional => 1 }), content => { - description => "Allowed content types.", + description => "Allowed content types. Note: value 'rootdir' is used for Containers, and value 'images' for KVM-Qemu VM's.\n", type => 'string', format => 'pve-storage-content-list', optional => 1, }, @@ -41,7 +43,7 @@ my $defaultData = { type => 'boolean', optional => 1, }, - 'format' => { + 'format' => { description => "Default Image format.", type => 'string', format => 'pve-storage-format', optional => 1, @@ -55,7 +57,7 @@ sub content_hash_to_string { my @cta; foreach my $ct (keys %$hash) { push @cta, $ct if $hash->{$ct}; - } + } return join(',', @cta); } @@ -75,7 +77,7 @@ sub default_format { my $type = $scfg->{type}; my $def = $defaultData->{plugindata}->{$type}; - + my $def_format = 'raw'; my $valid_formats = [ $def_format ]; @@ -83,7 +85,7 @@ sub default_format { $def_format = $scfg->{format} || $def->{format}->[1]; $valid_formats = [ sort keys %{$def->{format}->[0]} ]; } - + return wantarray ? ($def_format, $valid_formats) : $def_format; } @@ -104,9 +106,9 @@ PVE::JSONSchema::register_format('pve-storage-server', \&verify_server); sub verify_server { my ($server, $noerr) = @_; - # fixme: use better regex ? - # IP or DNS name - if ($server !~ m/^[[:alnum:]\-\.]+$/) { + if (!(PVE::JSONSchema::pve_verify_ip($server, 1) || + PVE::JSONSchema::pve_verify_dns_name($server, 1))) + { return undef if $noerr; die "value does not look like a valid server name or IP address\n"; } @@ -131,7 +133,7 @@ sub verify_portal_dns { my ($portal, $noerr) = @_; # IP or DNS name with optional port - if ($portal !~ m/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}|[[:alnum:]\-\.]+)(:\d+)?$/) { + if (!PVE::Tools::parse_host_and_port($portal)) { return undef if $noerr; die "value does not look like a valid portal address\n"; } @@ -143,7 +145,7 @@ sub verify_content { my ($ct, $noerr) = @_; my $valid_content = valid_content_types('dir'); # dir includes all types - + if (!$valid_content->{$ct}) { return undef if $noerr; die "invalid content type '$ct'\n"; @@ -156,7 +158,7 @@ PVE::JSONSchema::register_format('pve-storage-format', \&verify_format); sub verify_format { my ($fmt, $noerr) = @_; - if ($fmt !~ m/(raw|qcow2|vmdk)/) { + if ($fmt !~ m/(raw|qcow2|vmdk|subvol)/) { return undef if $noerr; die "invalid format '$fmt'\n"; } @@ -177,6 +179,17 @@ sub verify_options { return $value; } +PVE::JSONSchema::register_format('pve-volume-id', \&parse_volume_id); +sub parse_volume_id { + my ($volid, $noerr) = @_; + + if ($volid =~ m/^([a-z][a-z0-9\-\_\.]*[a-z0-9]):(.+)$/i) { + return wantarray ? ($1, $2) : $1; + } + return undef if $noerr; + die "unable to parse volume ID '$volid'\n"; +} + sub private { return $defaultData; @@ -203,7 +216,7 @@ sub decode_value { if ($key eq 'content') { my $valid_content = $def->{content}->[0]; - + my $res = {}; foreach my $c (PVE::Tools::split_list($value)) { @@ -211,7 +224,7 @@ sub decode_value { die "storage does not support content type '$c'\n"; } $res->{$c} = 1; - } + } if ($res->{none} && scalar (keys %$res) > 1) { die "unable to combine 'none' with other content types\n"; @@ -278,7 +291,7 @@ sub parse_config { content => { images => 1, rootdir => 1, vztmpl => 1, iso => 1}, }; } - + # we always need this for OpenVZ $ids->{local}->{content}->{rootdir} = 1; $ids->{local}->{content}->{vztmpl} = 1; @@ -300,7 +313,7 @@ sub parse_config { $d->{content} = $def->{content}->[1] if !$d->{content}; } - if ($type eq 'iscsi' || $type eq 'nfs' || $type eq 'rbd' || $type eq 'sheepdog' || $type eq 'iscsidirect' ) { + if ($type eq 'iscsi' || $type eq 'nfs' || $type eq 'rbd' || $type eq 'sheepdog' || $type eq 'iscsidirect' || $type eq 'glusterfs' || $type eq 'zfs' || $type eq 'drbd') { $d->{shared} = 1; } } @@ -318,20 +331,20 @@ sub cluster_lock_storage { my $lockid = "pve-storage-$storeid"; my $lockdir = "/var/lock/pve-manager"; mkdir $lockdir; - $res = PVE::Tools::lock_file("$lockdir/$lockid", $timeout, $func, @param); + $res = PVE::Tools::lock_file("$lockdir/$lockid", $timeout, $func, @param); die $@ if $@; } else { $res = PVE::Cluster::cfs_lock_storage($storeid, $timeout, $func, @param); die $@ if $@; - } + } return $res; } sub parse_name_dir { my $name = shift; - if ($name =~ m!^([^/\s]+\.(raw|qcow2|vmdk))$!) { - return ($1, $2); + if ($name =~ m!^((base-)?[^/\s]+\.(raw|qcow2|vmdk|subvol))$!) { + return ($1, $3, $2); # (name, format, isBase) } die "unable to parse volume filename '$name'\n"; @@ -340,19 +353,25 @@ sub parse_name_dir { sub parse_volname { my ($class, $volname) = @_; - if ($volname =~ m!^(\d+)/(\S+)$!) { + if ($volname =~ m!^(\d+)/(\S+)/(\d+)/(\S+)$!) { + my ($basedvmid, $basename) = ($1, $2); + parse_name_dir($basename); + my ($vmid, $name) = ($3, $4); + my (undef, $format, $isBase) = parse_name_dir($name); + return ('images', $name, $vmid, $basename, $basedvmid, $isBase, $format); + } elsif ($volname =~ m!^(\d+)/(\S+)$!) { my ($vmid, $name) = ($1, $2); - parse_name_dir($name); - return ('images', $name, $vmid); + my (undef, $format, $isBase) = parse_name_dir($name); + return ('images', $name, $vmid, undef, undef, $isBase, $format); } elsif ($volname =~ m!^iso/([^/]+\.[Ii][Ss][Oo])$!) { return ('iso', $1); - } elsif ($volname =~ m!^vztmpl/([^/]+\.tar\.gz)$!) { + } elsif ($volname =~ m!^vztmpl/([^/]+\.tar\.[gx]z)$!) { return ('vztmpl', $1); } elsif ($volname =~ m!^rootdir/(\d+)$!) { return ('rootdir', $1, $1); - } elsif ($volname =~ m!^backup/([^/]+(\.(tar|tar\.gz|tar\.lzo|tgz)))$!) { + } elsif ($volname =~ m!^backup/([^/]+(\.(tar|tar\.gz|tar\.lzo|tgz|vma|vma\.gz|vma\.lzo)))$!) { my $fn = $1; - if ($fn =~ m/^vzdump-(openvz|qemu)-(\d+)-.+/) { + if ($fn =~ m/^vzdump-(openvz|lxc|qemu)-(\d+)-.+/) { return ('backup', $fn, $2); } return ('backup', $fn); @@ -361,7 +380,7 @@ sub parse_volname { die "unable to parse directory volume name '$volname'\n"; } -my $vtype_subdirs = { +my $vtype_subdirs = { images => 'images', rootdir => 'private', iso => 'template/iso', @@ -380,13 +399,19 @@ sub get_subdir { die "unknown vtype '$vtype'\n" if !defined($subdir); - return "$path/$subdir"; + return "$path/$subdir"; } -sub path { - my ($class, $scfg, $volname, $storeid) = @_; +sub filesystem_path { + my ($class, $scfg, $volname, $snapname) = @_; + + my ($vtype, $name, $vmid, undef, undef, $isBase, $format) = + $class->parse_volname($volname); - my ($vtype, $name, $vmid) = $class->parse_volname($volname); + # Note: qcow2/qed has internal snapshot, so path is always + # the same (with or without snapshot => same file). + die "can't snapshot this image format\n" + if defined($snapname) && $format !~ m/^(qcow2|qed)$/; my $dir = $class->get_subdir($scfg, $vtype); @@ -397,6 +422,123 @@ sub path { return wantarray ? ($path, $vmid, $vtype) : $path; } +sub path { + my ($class, $scfg, $volname, $storeid, $snapname) = @_; + + return $class->filesystem_path($scfg, $volname, $snapname); +} + +sub create_base { + my ($class, $storeid, $scfg, $volname) = @_; + + # this only works for file based storage types + die "storage definintion has no path\n" if !$scfg->{path}; + + my ($vtype, $name, $vmid, $basename, $basevmid, $isBase, $format) = + $class->parse_volname($volname); + + die "create_base on wrong vtype '$vtype'\n" if $vtype ne 'images'; + + die "create_base not possible with base image\n" if $isBase; + + my $path = $class->filesystem_path($scfg, $volname); + + my ($size, undef, $used, $parent) = file_size_info($path); + die "file_size_info on '$volname' failed\n" if !($format && defined($size)); + + die "volname '$volname' contains wrong information about parent\n" + if $basename && (!$parent || $parent ne "../$basevmid/$basename"); + + my $newname = $name; + $newname =~ s/^vm-/base-/; + + my $newvolname = $basename ? "$basevmid/$basename/$vmid/$newname" : + "$vmid/$newname"; + + my $newpath = $class->filesystem_path($scfg, $newvolname); + + die "file '$newpath' already exists\n" if -f $newpath; + + rename($path, $newpath) || + die "rename '$path' to '$newpath' failed - $!\n"; + + # We try to protect base volume + + chmod(0444, $newpath); # nobody should write anything + + # also try to set immutable flag + eval { run_command(['/usr/bin/chattr', '+i', $newpath]); }; + warn $@ if $@; + + return $newvolname; +} + +my $find_free_diskname = sub { + my ($imgdir, $vmid, $fmt) = @_; + + my $disk_ids = {}; + PVE::Tools::dir_glob_foreach($imgdir, + qr!(vm|base)-$vmid-disk-(\d+)\..*!, + sub { + my ($fn, $type, $disk) = @_; + $disk_ids->{$disk} = 1; + }); + + for (my $i = 1; $i < 100; $i++) { + if (!$disk_ids->{$i}) { + return "vm-$vmid-disk-$i.$fmt"; + } + } + + die "unable to allocate a new image name for VM $vmid in '$imgdir'\n"; +}; + +sub clone_image { + my ($class, $scfg, $storeid, $volname, $vmid, $snap) = @_; + + # this only works for file based storage types + die "storage definintion has no path\n" if !$scfg->{path}; + + my ($vtype, $basename, $basevmid, undef, undef, $isBase, $format) = + $class->parse_volname($volname); + + die "clone_image on wrong vtype '$vtype'\n" if $vtype ne 'images'; + + die "this storage type does not support clone_image on snapshot\n" if $snap; + + die "this storage type does not support clone_image on subvolumes\n" if $format eq 'subvol'; + + die "clone_image only works on base images\n" if !$isBase; + + my $imagedir = $class->get_subdir($scfg, 'images'); + $imagedir .= "/$vmid"; + + mkpath $imagedir; + + my $name = &$find_free_diskname($imagedir, $vmid, "qcow2"); + + warn "clone $volname: $vtype, $name, $vmid to $name (base=../$basevmid/$basename)\n"; + + my $newvol = "$basevmid/$basename/$vmid/$name"; + + my $path = $class->filesystem_path($scfg, $newvol); + + # Note: we use relative paths, so we need to call chdir before qemu-img + eval { + local $CWD = $imagedir; + + my $cmd = ['/usr/bin/qemu-img', 'create', '-b', "../$basevmid/$basename", + '-f', 'qcow2', $path]; + + run_command($cmd); + }; + my $err = $@; + + die $err if $err; + + return $newvol; +} + sub alloc_image { my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size) = @_; @@ -405,63 +547,82 @@ sub alloc_image { mkpath $imagedir; - if (!$name) { - for (my $i = 1; $i < 100; $i++) { - my @gr = <$imagedir/vm-$vmid-disk-$i.*>; - if (!scalar(@gr)) { - $name = "vm-$vmid-disk-$i.$fmt"; - last; - } - } - } - - die "unable to allocate an image name for VM $vmid in storage '$storeid'\n" - if !$name; + $name = &$find_free_diskname($imagedir, $vmid, $fmt) if !$name; my (undef, $tmpfmt) = parse_name_dir($name); - die "illegal name '$name' - wrong extension for format ('$tmpfmt != '$fmt')\n" + die "illegal name '$name' - wrong extension for format ('$tmpfmt != '$fmt')\n" if $tmpfmt ne $fmt; my $path = "$imagedir/$name"; die "disk image '$path' already exists\n" if -e $path; - run_command("/usr/bin/qemu-img create -f $fmt '$path' ${size}K", - errmsg => "unable to create image"); + if ($fmt eq 'subvol') { + # only allow this if size = 0, so that user knows what he is doing + die "storage does not support subvol quotas\n" if $size != 0; + + (mkdir $path) || die "unable to create subvol '$path' - $!\n"; + } else { + my $cmd = ['/usr/bin/qemu-img', 'create']; + + push @$cmd, '-o', 'preallocation=metadata' if $fmt eq 'qcow2'; + + push @$cmd, '-f', $fmt, $path, "${size}K"; + run_command($cmd, errmsg => "unable to create image"); + } + return "$vmid/$name"; } sub free_image { - my ($class, $storeid, $scfg, $volname) = @_; + my ($class, $storeid, $scfg, $volname, $isBase, $format) = @_; - my $path = $class->path($scfg, $volname); + my $path = $class->filesystem_path($scfg, $volname); - if (! -f $path) { - warn "disk image '$path' does not exists\n"; + if ($format eq 'subvol') { + File::Path::remove_tree($path); } else { - unlink $path; - } + + if (! -f $path) { + warn "disk image '$path' does not exists\n"; + return undef; + } + + if ($isBase) { + # try to remove immutable flag + eval { run_command(['/usr/bin/chattr', '-i', $path]); }; + warn $@ if $@; + } + unlink($path) || die "unlink '$path' failed - $!\n"; + } + return undef; } sub file_size_info { my ($filename, $timeout) = @_; + if (-d $filename) { + return wantarray ? (0, 'subvol', 0, undef) : 1; + } + my $cmd = ['/usr/bin/qemu-img', 'info', $filename]; my $format; + my $parent; my $size = 0; my $used = 0; eval { run_command($cmd, timeout => $timeout, outfunc => sub { my $line = shift; - if ($line =~ m/^file format:\s+(\S+)\s*$/) { $format = $1; + } elsif ($line =~ m/^backing file:\s(\S+)\s/) { + $parent = $1; } elsif ($line =~ m/^virtual size:\s\S+\s+\((\d+)\s+bytes\)$/) { $size = int($1); } elsif ($line =~ m/^disk size:\s+(\d+(.\d+)?)([KMGT])\s*$/) { @@ -478,7 +639,107 @@ sub file_size_info { }); }; - return wantarray ? ($size, $format, $used) : $size; + return wantarray ? ($size, $format, $used, $parent) : $size; +} + +sub volume_size_info { + my ($class, $scfg, $storeid, $volname, $timeout) = @_; + my $path = $class->filesystem_path($scfg, $volname); + return file_size_info($path, $timeout); + +} + +sub volume_resize { + my ($class, $scfg, $storeid, $volname, $size, $running) = @_; + + die "can't resize this image format\n" if $volname !~ m/\.(raw|qcow2)$/; + + return 1 if $running; + + my $path = $class->filesystem_path($scfg, $volname); + + my $cmd = ['/usr/bin/qemu-img', 'resize', $path , $size]; + + run_command($cmd, timeout => 10); + + return undef; +} + +sub volume_snapshot { + my ($class, $scfg, $storeid, $volname, $snap) = @_; + + die "can't snapshot this image format\n" if $volname !~ m/\.(qcow2|qed)$/; + + my $path = $class->filesystem_path($scfg, $volname); + + my $cmd = ['/usr/bin/qemu-img', 'snapshot','-c', $snap, $path]; + + run_command($cmd); + + return undef; +} + +sub volume_rollback_is_possible { + my ($class, $scfg, $storeid, $volname, $snap) = @_; + + return 1; +} + +sub volume_snapshot_rollback { + my ($class, $scfg, $storeid, $volname, $snap) = @_; + + die "can't rollback snapshot this image format\n" if $volname !~ m/\.(qcow2|qed)$/; + + my $path = $class->filesystem_path($scfg, $volname); + + my $cmd = ['/usr/bin/qemu-img', 'snapshot','-a', $snap, $path]; + + run_command($cmd); + + return undef; +} + +sub volume_snapshot_delete { + my ($class, $scfg, $storeid, $volname, $snap, $running) = @_; + + die "can't delete snapshot for this image format\n" if $volname !~ m/\.(qcow2|qed)$/; + + return 1 if $running; + + my $path = $class->filesystem_path($scfg, $volname); + + my $cmd = ['/usr/bin/qemu-img', 'snapshot','-d', $snap, $path]; + + run_command($cmd); + + return undef; +} + +sub volume_has_feature { + my ($class, $scfg, $feature, $storeid, $volname, $snapname, $running) = @_; + + my $features = { + snapshot => { current => { qcow2 => 1}, snap => { qcow2 => 1} }, + clone => { base => {qcow2 => 1, raw => 1, vmdk => 1} }, + template => { current => {qcow2 => 1, raw => 1, vmdk => 1, subvol => 1} }, + copy => { base => {qcow2 => 1, raw => 1, vmdk => 1}, + current => {qcow2 => 1, raw => 1, vmdk => 1}, + snap => {qcow2 => 1} }, + }; + + my ($vtype, $name, $vmid, $basename, $basevmid, $isBase, $format) = + $class->parse_volname($volname); + + my $key = undef; + if($snapname){ + $key = 'snap'; + }else{ + $key = $isBase ? 'base' : 'current'; + } + + return 1 if defined($features->{$feature}->{$key}->{$format}); + + return undef; } sub list_images { @@ -487,7 +748,7 @@ sub list_images { my $imagedir = $class->get_subdir($scfg, 'images'); my ($defFmt, $vaidFmts) = default_format($scfg); - my $fmts = join ('|', @$vaidFmts); + my $fmts = join ('|', @$vaidFmts); my $res = []; @@ -498,23 +759,29 @@ sub list_images { my $owner = $2; my $name = $3; - my $volid = "$storeid:$owner/$name"; - if ($vollist) { - my $found = grep { $_ eq $volid } @$vollist; - next if !$found; + next if !$vollist && defined($vmid) && ($owner ne $vmid); + + my ($size, $format, $used, $parent) = file_size_info($fn); + next if !($format && defined($size)); + + my $volid; + if ($parent && $parent =~ m!^../(\d+)/([^/]+\.($fmts))$!) { + my ($basevmid, $basename) = ($1, $2); + $volid = "$storeid:$basevmid/$basename/$owner/$name"; } else { - next if defined($vmid) && ($owner ne $vmid); + $volid = "$storeid:$owner/$name"; } - my ($size, $format, $used) = file_size_info($fn); - - if ($format && $size) { - push @$res, { - volid => $volid, format => $format, - size => $size, vmid => $owner, used => $used }; + if ($vollist) { + my $found = grep { $_ eq $volid } @$vollist; + next if !$found; } + push @$res, { + volid => $volid, format => $format, + size => $size, vmid => $owner, used => $used, parent => $parent + }; } return $res; @@ -526,7 +793,7 @@ sub status { my $path = $scfg->{path}; die "storage definintion has no path\n" if !$path; - + my $timeout = 2; my $res = PVE::Tools::df($path, $timeout); @@ -547,9 +814,12 @@ sub activate_storage { if (defined($scfg->{content})) { foreach my $vtype (keys %$vtype_subdirs) { - next if !defined($scfg->{content}->{$vtype}); - my $subdir = $class->get_subdir($scfg, $vtype); - mkpath $subdir if $subdir ne $path; + # OpenVZMigrate uses backup (dump) dir + if (defined($scfg->{content}->{$vtype}) || + ($vtype eq 'backup' && defined($scfg->{content}->{'rootdir'}))) { + my $subdir = $class->get_subdir($scfg, $vtype); + mkpath $subdir if $subdir ne $path; + } } } } @@ -563,7 +833,7 @@ sub deactivate_storage { sub activate_volume { my ($class, $storeid, $scfg, $volname, $exclusive, $cache) = @_; - my $path = $class->path($scfg, $volname); + my $path = $class->filesystem_path($scfg, $volname); # check is volume exists if ($scfg->{path}) { @@ -579,4 +849,11 @@ sub deactivate_volume { # do nothing by default } +sub check_connection { + my ($class, $storeid, $scfg) = @_; + # do nothing by default + return 1; +} + + 1;