| 1 |
cardoe 12/07/08 04:23:26 |
| 2 |
|
| 3 |
Added: |
| 4 |
libvirt-0.9.13-qemu-add-rbd-to-whitelist-of-migration-safe-formats.patch |
| 5 |
Log: |
| 6 |
Add a patch to whitelist rbd migration since its now good in 0.9.13 |
| 7 |
|
| 8 |
(Portage version: 2.1.10.65/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 app-emulation/libvirt/files/libvirt-0.9.13-qemu-add-rbd-to-whitelist-of-migration-safe-formats.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/files/libvirt-0.9.13-qemu-add-rbd-to-whitelist-of-migration-safe-formats.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/files/libvirt-0.9.13-qemu-add-rbd-to-whitelist-of-migration-safe-formats.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: libvirt-0.9.13-qemu-add-rbd-to-whitelist-of-migration-safe-formats.patch |
| 17 |
=================================================================== |
| 18 |
From 78290b1641e95304c862062ee0aca95395c5926c Mon Sep 17 00:00:00 2001 |
| 19 |
From: Josh Durgin <josh.durgin@×××××××.com> |
| 20 |
Date: Mon, 2 Jul 2012 11:55:26 -0700 |
| 21 |
Subject: [PATCH 01/24] qemu: add rbd to whitelist of migration-safe formats |
| 22 |
|
| 23 |
QEMU (and librbd) flush the cache on the source before the |
| 24 |
destination starts, and the destination does not read any |
| 25 |
changeable data before that, so live migration with rbd caching |
| 26 |
is safe. |
| 27 |
|
| 28 |
This makes 'virsh migrate' work with rbd and caching without the |
| 29 |
--unsafe flag. |
| 30 |
|
| 31 |
Reported-by: Vladimir Bashkirtsev <vladimir@×××××××××××.com> |
| 32 |
Signed-off-by: Josh Durgin <josh.durgin@×××××××.com> |
| 33 |
--- |
| 34 |
.mailmap | 3 ++- |
| 35 |
AUTHORS | 2 +- |
| 36 |
src/qemu/qemu_migration.c | 3 +++ |
| 37 |
3 files changed, 6 insertions(+), 2 deletions(-) |
| 38 |
|
| 39 |
diff --git a/.mailmap b/.mailmap |
| 40 |
index 65e2c10..a6744ac 100644 |
| 41 |
--- a/.mailmap |
| 42 |
+++ b/.mailmap |
| 43 |
@@ -28,7 +28,8 @@ |
| 44 |
<supriyak@××××××××××××××.com> <supriyak@××××××.com> |
| 45 |
<neil@××××××××.uk> <neil@××××××××××××.uk> |
| 46 |
<stefanb@××××××.com> <stefanb@××××××××××××××.com> |
| 47 |
-<josh.durgin@×××××××××.com> <joshd@×××××××××××.net> |
| 48 |
+<josh.durgin@×××××××.com> <joshd@×××××××××××.net> |
| 49 |
+<josh.durgin@×××××××.com> <josh.durgin@×××××××××.com> |
| 50 |
|
| 51 |
# Name consolidation: |
| 52 |
# Preferred author spelling <preferred email> |
| 53 |
diff --git a/AUTHORS b/AUTHORS |
| 54 |
index 375db24..0e179a9 100644 |
| 55 |
--- a/AUTHORS |
| 56 |
+++ b/AUTHORS |
| 57 |
@@ -144,7 +144,7 @@ Patches have also been contributed by: |
| 58 |
Hu Tao <hutao@××××××××××.com> |
| 59 |
Laurent Léonard <laurent@××××××××××.org> |
| 60 |
MORITA Kazutaka <morita.kazutaka@××××××××××.jp> |
| 61 |
- Josh Durgin <josh.durgin@×××××××××.com> |
| 62 |
+ Josh Durgin <josh.durgin@×××××××.com> |
| 63 |
Roopa Prabhu <roprabhu@×××××.com> |
| 64 |
Paweł Krześniak <pawel.krzesniak@×××××.com> |
| 65 |
Kay Schubert <kayegypt@×××.de> |
| 66 |
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c |
| 67 |
index 48369d6..f51c99a 100644 |
| 68 |
--- a/src/qemu/qemu_migration.c |
| 69 |
+++ b/src/qemu/qemu_migration.c |
| 70 |
@@ -847,6 +847,9 @@ qemuMigrationIsSafe(virDomainDefPtr def) |
| 71 |
continue; |
| 72 |
else if (cfs < 0) |
| 73 |
return false; |
| 74 |
+ } else if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK && |
| 75 |
+ disk->protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD) { |
| 76 |
+ continue; |
| 77 |
} |
| 78 |
|
| 79 |
qemuReportError(VIR_ERR_MIGRATE_UNSAFE, "%s", |
| 80 |
-- |
| 81 |
1.7.8.6 |
Archives