fix bug #12: check storage availability early (migrate)

diff --git a/Makefile b/Makefile
index 62d0ed4908a9610e030cc46db12a97a7afbc5c23..9995b9392f637c03aa3952426d3ccb33176f00b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 VERSION=2.0
 PACKAGE=qemu-server
-PKGREL=33
+PKGREL=34
 
 DESTDIR=
 PREFIX=/usr

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 9537a3cb7f424bda1d14c700efbc1d07bb4ce890..91d9439e331a4098127eb9b56576ce0d83d56e65 100644 (file)
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -1633,6 +1633,9 @@ __PACKAGE__->register_method({
                if !$param->{online};
        }
 
+       my $storecfg = PVE::Storage::config();
+       PVE::QemuServer::check_storage_availability($storecfg, $conf, "test");
+
        if (&$vm_is_ha_managed($vmid) && $rpcenv->{type} ne 'ha') {
 
            my $hacmd = sub {

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 8f771d549ba83ec00cee7f29b44e970ce9944c09..80dc2b575a09f82c9c220ecea55856b321339651 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -1682,6 +1682,25 @@ sub check_local_resources {
     return $loc_res;
 }
 
+# check is used storages are available on all nodes (use by migrate)
+sub check_storage_availability {
+    my ($storecfg, $conf, $node) = @_;
+
+    foreach_drive($conf, sub {
+       my ($ds, $drive) = @_;
+
+       my $volid = $drive->{file};
+       return if !$volid;
+
+       my ($sid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
+       return if !$sid;
+
+       # check if storage is available on both nodes
+       my $scfg = PVE::Storage::storage_check_node($storecfg, $sid);
+       PVE::Storage::storage_check_node($storecfg, $sid, $node);
+   });
+}
+
 sub check_lock {
     my ($conf) = @_;
 

diff --git a/changelog.Debian b/changelog.Debian
index ba7c26146fbae867ac4c1fbcede9b3f7b66c94e6..ad909db1131a239ec711f2e24a7cd9d588bf5960 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+qemu-server (2.0-34) unstable; urgency=low
+
+  * fix bug #12: check storage availability early (migrate)
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 30 Mar 2012 09:12:46 +0200
+
 qemu-server (2.0-33) unstable; urgency=low
 
   * fix bug #121: activate volumes correctly