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

introduce new method filesystem_path()

Browse Source 
If a plugin overwrites method path() to return optimized setting for qemu,
it can now still use the generic methods from PVE::Storage::Plugin which works
on file system paths (for example the glusterfs plugin).
This commit is contained in:
Dietmar Maurer
2013-09-17 09:03:01 +02:00
parent 9402289e7f
commit 08480ce768
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
PVE/Storage/Plugin.pm
View File

@ -401,7 +401,7 @@ sub get_subdir {
return "$path/$subdir";
}
sub path {
sub filesystem_path {
my ($class, $scfg, $volname, $storeid) = @_;
my ($vtype, $name, $vmid) = $class->parse_volname($volname);
@ -415,6 +415,12 @@ sub path {
return wantarray ? ($path, $vmid, $vtype) : $path;
}
sub path {
my ($class, $scfg, $volname, $storeid) = @_;
return $class->filesystem_path($scfg, $volname, $storeid);
}
sub create_base {
my ($class, $storeid, $scfg, $volname) = @_;
@ -428,7 +434,7 @@ sub create_base {
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);
@ -442,7 +448,7 @@ sub create_base {
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;
@ -504,7 +510,7 @@ sub clone_image {
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
eval {
@ -555,7 +561,7 @@ sub alloc_image {
sub free_image {
my ($class, $storeid, $scfg, $volname, $isBase) = @_;
my $path = $class->path($scfg, $volname);
my $path = $class->filesystem_path($scfg, $volname);
if (! -f $path) {
warn "disk image '$path' does not exists\n";
@ -611,7 +617,7 @@ sub file_size_info {
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);
}
@ -623,7 +629,7 @@ sub volume_resize {
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];
@ -639,7 +645,7 @@ sub volume_snapshot {
return 1 if $running;
my $path = $class->path($scfg, $volname);
my $path = $class->filesystem_path($scfg, $volname);
my $cmd = ['/usr/bin/qemu-img', 'snapshot','-c', $snap, $path];
@ -653,7 +659,7 @@ sub volume_snapshot_rollback {
die "can't rollback snapshot this image format" 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];
@ -669,7 +675,7 @@ sub volume_snapshot_delete {
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];
@ -798,7 +804,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}) {