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. Note: value 'rootdir' is used for Containers, and value 'images' for KVM-Qemu VM's.\n",
+ 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,
},
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";
}
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 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, $format) =
$class->parse_volname($volname);
# 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";
+ 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'];
my $path = $class->filesystem_path($scfg, $volname);
- if ($format eq 'subvol') {
+ if ($isBase) {
+ # try to remove immutable flag
+ eval { run_command(['/usr/bin/chattr', '-i', $path]); };
+ warn $@ if $@;
+ }
+
+ if (defined($format) && ($format eq 'subvol')) {
File::Path::remove_tree($path);
} else {
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";
}
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);
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) = @_;
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);
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, $format) =
return ($res->{total}, $res->{avail}, $res->{used}, 1);
}
+sub volume_snapshot_list {
+ my ($class, $scfg, $storeid, $volname, $prefix, $ip) = @_;
+
+ # implement in subclass
+ die "Volume_snapshot_list is not implemented for $class";
+
+ # retrun an empty array if dataset does not exist.
+}
+
sub activate_storage {
my ($class, $storeid, $scfg, $cache) = @_;
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
}
projects / pve-storage.git / blobdiff