[pve-devel] [PATCH] remove running from Storage and check it in QemuServer

Wolfgang Link w.link at proxmox.com
Wed May 6 09:57:34 CEST 2015


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 at proxmox.com>
---
 PVE/QemuServer.pm | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 708b208..9a4e2ee 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -31,6 +31,8 @@ use PVE::QMPClient;
 use PVE::RPCEnvironment;
 use Time::HiRes qw(gettimeofday);
 
+my $qemu_snap_storage = {rbd => 1, sheepdog => 1};
+
 my $cpuinfo = PVE::ProcFSTools::read_cpuinfo();
 
 # Note about locking: we use flock on the config file protect
@@ -3777,12 +3779,11 @@ sub qemu_volume_snapshot {
 
     my $running = check_running($vmid);
 
-    return if !PVE::Storage::volume_snapshot($storecfg, $volid, $snap, $running);
-
-    return if !$running;
-
-    vm_mon_cmd($vmid, "snapshot-drive", device => $deviceid, name => $snap);
-
+    if ($running && do_snapshots_with_qemu($storecfg, $volid)){
+	vm_mon_cmd($vmid, "snapshot-drive", device => $deviceid, name => $snap);
+    } else {
+	PVE::Storage::volume_snapshot($storecfg, $volid, $snap);
+    }
 }
 
 sub qemu_volume_snapshot_delete {
@@ -5772,6 +5773,22 @@ my $savevm_wait = sub {
     }
 };
 
+sub do_snapshots_with_qemu {
+    my ($storecfg, $volid) = @_;
+
+    my $storage_name = PVE::Storage::parse_volume_id($volid);
+
+    if ($qemu_snap_storage->{$storecfg->{ids}->{$storage_name}->{type}} ){
+	return 1;
+    }
+
+    if ($volid =~ m/\.(qcow2|qed)$/){
+	return 1;
+    }
+
+    return undef;
+}
+
 sub snapshot_create {
     my ($vmid, $snapname, $save_vmstate, $comment) = @_;
 
-- 
2.1.4




More information about the pve-devel mailing list