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,
},
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";
}
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";
}
$d->{content} = $def->{content}->[1] if !$d->{content};
}
- if ($type eq 'iscsi' || $type eq 'nfs' || $type eq 'rbd' || $type eq 'sheepdog' || $type eq 'iscsidirect' || $type eq 'nexenta' ) {
+ 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;
}
}
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);
return "$path/$subdir";
}
-sub path {
- my ($class, $scfg, $volname, $storeid) = @_;
+sub filesystem_path {
+ 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);
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) =
+ 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->path($scfg, $volname);
+ 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");
my $newvolname = $basename ? "$basevmid/$basename/$vmid/$newname" :
"$vmid/$newname";
- my $newpath = $class->path($scfg, $newvolname);
+ my $newpath = $class->filesystem_path($scfg, $newvolname);
die "file '$newpath' already exists\n" if -f $newpath;
- rename($path, $newpath) ||
+ rename($path, $newpath) ||
die "rename '$path' to '$newpath' failed - $!\n";
# We try to protect base volume
# also try to set immutable flag
eval { run_command(['/usr/bin/chattr', '+i', $newpath]); };
warn $@ if $@;
-
+
return $newvolname;
}
my ($imgdir, $vmid, $fmt) = @_;
my $disk_ids = {};
- PVE::Tools::dir_glob_foreach($imgdir,
+ PVE::Tools::dir_glob_foreach($imgdir,
qr!(vm|base)-$vmid-disk-(\d+)\..*!,
sub {
- my ($fn, $type, $disk) = @_;
+ my ($fn, $type, $disk) = @_;
$disk_ids->{$disk} = 1;
});
};
sub clone_image {
- my ($class, $scfg, $storeid, $volname, $vmid) = @_;
+ 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) =
+ 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 "clone_image onyl works on base images\n" if !$isBase;
+ 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";
my $newvol = "$basevmid/$basename/$vmid/$name";
- my $path = $class->path($scfg, $newvol);
+ my $path = $class->filesystem_path($scfg, $newvol);
- # Note: we use relative paths, so we need to call chdir before qemu-img
+ # 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",
+ my $cmd = ['/usr/bin/qemu-img', 'create', '-b', "../$basevmid/$basename",
'-f', 'qcow2', $path];
-
+
run_command($cmd);
};
my $err = $@;
mkpath $imagedir;
$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 "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;
+
+ (mkdir $path) || die "unable to create subvol '$path' - $!\n";
+ } 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->path($scfg, $volname);
+ 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 $@;
- }
+ if ($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";
+ 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;
sub volume_size_info {
my ($class, $scfg, $storeid, $volname, $timeout) = @_;
- my $path = $class->path($scfg, $volname);
+ 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" 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->path($scfg, $volname);
+ my $path = $class->filesystem_path($scfg, $volname);
my $cmd = ['/usr/bin/qemu-img', 'resize', $path , $size];
}
sub volume_snapshot {
- my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
-
- die "can't snapshot this image format" if $volname !~ m/\.(qcow2|qed)$/;
+ my ($class, $scfg, $storeid, $volname, $snap) = @_;
- return 1 if $running;
+ die "can't snapshot this image format\n" if $volname !~ m/\.(qcow2|qed)$/;
- my $path = $class->path($scfg, $volname);
+ my $path = $class->filesystem_path($scfg, $volname);
my $cmd = ['/usr/bin/qemu-img', 'snapshot','-c', $snap, $path];
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" if $volname !~ m/\.(qcow2|qed)$/;
+ die "can't rollback snapshot this image format\n" if $volname !~ m/\.(qcow2|qed)$/;
- my $path = $class->path($scfg, $volname);
+ my $path = $class->filesystem_path($scfg, $volname);
my $cmd = ['/usr/bin/qemu-img', 'snapshot','-a', $snap, $path];
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->path($scfg, $volname);
+ my $path = $class->filesystem_path($scfg, $volname);
my $cmd = ['/usr/bin/qemu-img', 'snapshot','-d', $snap, $path];
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} },
- copy => { base => {qcow2 => 1, raw => 1, vmdk => 1},
+ 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) =
+ 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 = $snapname
+ $key = 'snap';
}else{
$key = $isBase ? 'base' : 'current';
}
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))$!) {
push @$res, {
volid => $volid, format => $format,
- size => $size, vmid => $owner, used => $used, parent => $parent
+ size => $size, vmid => $owner, used => $used, parent => $parent
};
}
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}) {
projects / pve-storage.git / blobdiff