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

remove running from Storage and check it in QemuServer

Browse Source 
It is better to check if a VM is running in QemuServer then in Storage.
for the Storage there is no difference if it is running or not.

Signed-off-by: Wolfgang Link <w.link@proxmox.com>
This commit is contained in:
Wolfgang Link
2015-05-06 09:57:35 +02:00
committed by Dietmar Maurer
parent 1ccae4490e
commit f5640e7d3b
7 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PVE/Storage.pm
View File

@ -162,13 +162,13 @@ sub volume_rollback_is_possible {
}
sub volume_snapshot {
my ($cfg, $volid, $snap, $running) = @_;
my ($cfg, $volid, $snap) = @_;
my ($storeid, $volname) = parse_volume_id($volid, 1);
if ($storeid) {
my $scfg = storage_config($cfg, $storeid);
my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
return $plugin->volume_snapshot($scfg, $storeid, $volname, $snap, $running);
return $plugin->volume_snapshot($scfg, $storeid, $volname, $snap);
} elsif ($volid =~ m|^(/.+)$| && -e $volid) {
die "snapshot file/device '$volid' is not possible\n";
} else {

2
PVE/Storage/ISCSIDirectPlugin.pm
View File

@ -205,7 +205,7 @@ sub volume_resize {
}
sub volume_snapshot {
my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
my ($class, $scfg, $storeid, $volname, $snap) = @_;
die "volume snapshot is not possible on iscsi device";
}

2
PVE/Storage/LVMPlugin.pm
View File

@ -456,7 +456,7 @@ sub volume_resize {
}
sub volume_snapshot {
my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
my ($class, $scfg, $storeid, $volname, $snap) = @_;
die "lvm snapshot is not implemented";
}

4
PVE/Storage/Plugin.pm
View File

@ -641,12 +641,10 @@ sub volume_resize {
}
sub volume_snapshot {
my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
my ($class, $scfg, $storeid, $volname, $snap) = @_;
die "can't snapshot 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','-c', $snap, $path];

4
PVE/Storage/RBDPlugin.pm
View File

@ -510,9 +510,7 @@ sub volume_resize {
}
sub volume_snapshot {
my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
return 1 if $running;
my ($class, $scfg, $storeid, $volname, $snap) = @_;
my ($vtype, $name, $vmid) = $class->parse_volname($volname);

4
PVE/Storage/SheepdogPlugin.pm
View File

@ -389,9 +389,7 @@ sub volume_resize {
}
sub volume_snapshot {
my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
return 1 if $running;
my ($class, $scfg, $storeid, $volname, $snap) = @_;
my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =
$class->parse_volname($volname);

2
PVE/Storage/ZFSPoolPlugin.pm
View File

@ -446,7 +446,7 @@ sub volume_size_info {
}
sub volume_snapshot {
my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
my ($class, $scfg, $storeid, $volname, $snap) = @_;
$class->zfs_request($scfg, undef, 'snapshot', "$scfg->{pool}/$volname\@$snap");
}