sub { __PACKAGE__->parse_config(@_); },
sub { __PACKAGE__->write_config(@_); });
+
my $defaultData = {
propertyList => {
type => { description => "Storage type." },
- storage => get_standard_option('pve-storage-id'),
+ storage => get_standard_option('pve-storage-id',
+ { completion => \&PVE::Storage::complete_storage }),
nodes => get_standard_option('pve-node-list', { optional => 1 }),
content => {
- description => "Allowed content types.",
+ description => "Allowed content types.\n\nNOTE: the value " .
+ "'rootdir' is used for Containers, and value 'images' for VMs.\n",
type => 'string', format => 'pve-storage-content-list',
optional => 1,
+ completion => \&PVE::Storage::complete_content_type,
},
disable => {
description => "Flag to disable the storage.",
optional => 1,
},
'format' => {
- description => "Default Image format.",
+ description => "Default image format.",
type => 'string', format => 'pve-storage-format',
optional => 1,
},
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";
}
return $server;
}
+PVE::JSONSchema::register_format('pve-storage-vgname', \&parse_lvm_name);
+sub parse_lvm_name {
+ my ($name, $noerr) = @_;
+
+ if ($name !~ m/^[a-z][a-z0-9\-\_\.]*[a-z0-9]$/i) {
+ return undef if $noerr;
+ die "lvm name '$name' contains illegal characters\n";
+ }
+
+ return $name;
+}
+
# fixme: do we need this
#PVE::JSONSchema::register_format('pve-storage-portal', \&verify_portal);
#sub verify_portal {
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";
}
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";
}
foreach my $c (PVE::Tools::split_list($value)) {
if (!$valid_content->{$c}) {
- die "storage does not support content type '$c'\n";
+ warn "storage does not support content type '$c'\n";
+ next;
}
$res->{$c} = 1;
}
my $valid_formats = $def->{format}->[0];
if (!$valid_formats->{$value}) {
- die "storage does not support format '$value'\n";
+ warn "storage does not support format '$value'\n";
+ next;
}
return $value;
my $ids = $cfg->{ids};
# make sure we have a reasonable 'local:' storage
- # openvz expects things to be there
+ # we want 'local' to be always the same 'type' (on all cluster nodes)
if (!$ids->{local} || $ids->{local}->{type} ne 'dir' ||
($ids->{local}->{path} && $ids->{local}->{path} ne '/var/lib/vz')) {
$ids->{local} = {
};
}
- # we always need this for OpenVZ
- $ids->{local}->{content}->{rootdir} = 1;
- $ids->{local}->{content}->{vztmpl} = 1;
- delete ($ids->{local}->{disable});
-
# make sure we have a path
$ids->{local}->{path} = '/var/lib/vz' if !$ids->{local}->{path};
sub parse_name_dir {
my $name = shift;
- if ($name =~ m!^((base-)?[^/\s]+\.(raw|qcow2|vmdk))$!) {
- return ($1, $3, $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";
my ($basedvmid, $basename) = ($1, $2);
parse_name_dir($basename);
my ($vmid, $name) = ($3, $4);
- my (undef, undef, $isBase) = parse_name_dir($name);
- return ('images', $name, $vmid, $basename, $basedvmid, $isBase);
+ 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);
- my (undef, undef, $isBase) = parse_name_dir($name);
- return ('images', $name, $vmid, undef, undef, $isBase);
+ 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|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);
}
sub filesystem_path {
- my ($class, $scfg, $volname, $storeid) = @_;
+ my ($class, $scfg, $volname, $snapname) = @_;
- my ($vtype, $name, $vmid) = $class->parse_volname($volname);
+ my ($vtype, $name, $vmid, undef, undef, $isBase, $format) =
+ $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);
}
sub path {
- my ($class, $scfg, $volname, $storeid) = @_;
+ my ($class, $scfg, $volname, $storeid, $snapname) = @_;
- return $class->filesystem_path($scfg, $volname, $storeid);
+ 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};
+ die "storage definition has no path\n" if !$scfg->{path};
- my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =
+ my ($vtype, $name, $vmid, $basename, $basevmid, $isBase, $format) =
$class->parse_volname($volname);
die "create_base on wrong vtype '$vtype'\n" if $vtype ne 'images';
my $path = $class->filesystem_path($scfg, $volname);
- my ($size, $format, $used, $parent) = file_size_info($path);
- die "file_size_info on '$volname' failed\n" if !($format && $size);
+ 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");
# 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) =
+ 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');
die "disk image '$path' already exists\n" if -e $path;
- my $cmd = ['/usr/bin/qemu-img', 'create'];
-
- push @$cmd, '-o', 'preallocation=metadata' if $fmt eq 'qcow2';
-
- push @$cmd, '-f', $fmt, $path, "${size}K";
+ 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;
+
+ my $old_umask = umask(0022);
+ my $err;
+ mkdir($path) or $err = "unable to create subvol '$path' - $!\n";
+ umask $old_umask;
+ die $err if $err;
+ } else {
+ my $cmd = ['/usr/bin/qemu-img', 'create'];
- run_command($cmd, errmsg => "unable to create image");
+ 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, $isBase) = @_;
+ my ($class, $storeid, $scfg, $volname, $isBase, $format) = @_;
my $path = $class->filesystem_path($scfg, $volname);
- 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";
+ if (defined($format) && ($format eq 'subvol')) {
+ File::Path::remove_tree($path);
+ } else {
+
+ if (! -f $path) {
+ warn "disk image '$path' does not exists\n";
+ return undef;
+ }
+ 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;
sub volume_resize {
my ($class, $scfg, $storeid, $volname, $size, $running) = @_;
- die "can't resize this image format" if $volname !~ m/\.(raw|qcow2)$/;
+ 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];
+ my $format = ($class->parse_volname($volname))[6];
+
+ my $cmd = ['/usr/bin/qemu-img', 'resize', '-f', $format, $path , $size];
run_command($cmd, timeout => 10);
}
sub volume_snapshot {
- my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
+ my ($class, $scfg, $storeid, $volname, $snap) = @_;
- die "can't snapshot this image format" if $volname !~ m/\.(qcow2|qed)$/;
-
- return 1 if $running;
+ die "can't snapshot this image format\n" if $volname !~ m/\.(qcow2|qed)$/;
my $path = $class->filesystem_path($scfg, $volname);
return undef;
}
+sub volume_send {
+ my ($class, $scfg, $storeid, $volname, $ip, $snap,
+ $incremental_snap, $verbose, $limit, $target_path) = @_;
+
+ # implement in subclass
+ die "Volume_send is not implemented for $class";
+}
+
sub volume_rollback_is_possible {
my ($class, $scfg, $storeid, $volname, $snap) = @_;
sub volume_snapshot_rollback {
my ($class, $scfg, $storeid, $volname, $snap) = @_;
- die "can't rollback snapshot this image format" if $volname !~ m/\.(qcow2|qed)$/;
+ die "can't rollback snapshot this image format\n" if $volname !~ m/\.(qcow2|qed)$/;
my $path = $class->filesystem_path($scfg, $volname);
sub volume_snapshot_delete {
my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
- die "can't delete snapshot for this image format" if $volname !~ m/\.(qcow2|qed)$/;
+ 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);
+ $class->deactivate_volume($storeid, $scfg, $volname, $snap, {});
+
my $cmd = ['/usr/bin/qemu-img', 'snapshot','-d', $snap, $path];
run_command($cmd);
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} },
+ 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} },
+ sparseinit => { base => {qcow2 => 1, raw => 1, vmdk => 1},
+ current => {qcow2 => 1, raw => 1, vmdk => 1} },
};
- my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =
+ my ($vtype, $name, $vmid, $basename, $basevmid, $isBase, $format) =
$class->parse_volname($volname);
- my (undef, $format) = parse_name_dir($name);
-
my $key = undef;
if($snapname){
$key = 'snap';
next if !$vollist && defined($vmid) && ($owner ne $vmid);
my ($size, $format, $used, $parent) = file_size_info($fn);
- next if !($format && $size);
+ next if !($format && defined($size));
my $volid;
if ($parent && $parent =~ m!^../(\d+)/([^/]+\.($fmts))$!) {
die "unable to activate storage '$storeid' - " .
"directory '$path' does not exist\n" if ! -d $path;
+ return if defined($scfg->{mkdir}) && !$scfg->{mkdir};
+
if (defined($scfg->{content})) {
foreach my $vtype (keys %$vtype_subdirs) {
# OpenVZMigrate uses backup (dump) dir
}
sub activate_volume {
- my ($class, $storeid, $scfg, $volname, $exclusive, $cache) = @_;
+ my ($class, $storeid, $scfg, $volname, $snapname, $cache) = @_;
- my $path = $class->filesystem_path($scfg, $volname);
+ my $path = $class->filesystem_path($scfg, $volname, $snapname);
# check is volume exists
if ($scfg->{path}) {
}
sub deactivate_volume {
- my ($class, $storeid, $scfg, $volname, $cache) = @_;
+ my ($class, $storeid, $scfg, $volname, $snapname, $cache) = @_;
# do nothing by default
}