qemu: add rbd to whitelist of migration-safe formats

QEMU (and librbd) flush the cache on the source before the
destination starts, and the destination does not read any
changeable data before that, so live migration with rbd caching
is safe.

This makes 'virsh migrate' work with rbd and caching without the
--unsafe flag.

Reported-by: Vladimir Bashkirtsev <vladimir@bashkirtsev.com>
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/.mailmap b/.mailmap
index 65e2c10871af8b32cfdaab97d116e1fbe40cbe61..a6744acb72fa08f7b52cfa8d322e6d3e89601730 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -28,7 +28,8 @@
 <supriyak@linux.vnet.ibm.com> <supriyak@in.ibm.com>
 <neil@aldur.co.uk> <neil@brightbox.co.uk>
 <stefanb@us.ibm.com> <stefanb@linux.vnet.ibm.com>
-<josh.durgin@dreamhost.com> <joshd@hq.newdream.net>
+<josh.durgin@inktank.com> <joshd@hq.newdream.net>
+<josh.durgin@inktank.com> <josh.durgin@dreamhost.com>
 
 # Name consolidation:
 # Preferred author spelling <preferred email>

diff --git a/AUTHORS b/AUTHORS
index 375db24b49fc8fed5103165d00065202cd300f97..0e179a9caab0c7df4a1ba200705ecfc603de6bf5 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -144,7 +144,7 @@ Patches have also been contributed by:
   Hu Tao               <hutao@cn.fujitsu.com>
   Laurent Léonard      <laurent@open-minds.org>
   MORITA Kazutaka      <morita.kazutaka@lab.ntt.co.jp>
-  Josh Durgin          <josh.durgin@dreamhost.com>
+  Josh Durgin          <josh.durgin@inktank.com>
   Roopa Prabhu         <roprabhu@cisco.com>
   Paweł Krześniak      <pawel.krzesniak@gmail.com>
   Kay Schubert         <kayegypt@web.de>

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 48369d65ec6684966d55ca3e54cd76059110d291..f51c99ab1fb79c314bd678517e9b812200fc921c 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -847,6 +847,9 @@ qemuMigrationIsSafe(virDomainDefPtr def)
                     continue;
                 else if (cfs < 0)
                     return false;
+            } else if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK &&
+                       disk->protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD) {
+                continue;
             }
 
             qemuReportError(VIR_ERR_MIGRATE_UNSAFE, "%s",