[pve-devel] [PATCH] rbd : disable cache_writethtrough_until_flush with cache=unsafe

[Alexandre Derumier]

Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
 ...-rbd_cache_writethrough_until_flush-with-.patch | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 debian/patches/pve/0054-rbd-disable-rbd_cache_writethrough_until_flush-with-.patch

diff --git a/debian/patches/pve/0054-rbd-disable-rbd_cache_writethrough_until_flush-with-.patch b/debian/patches/pve/0054-rbd-disable-rbd_cache_writethrough_until_flush-with-.patch
new file mode 100644
index 0000000..e1fab0b
--- /dev/null
+++ b/debian/patches/pve/0054-rbd-disable-rbd_cache_writethrough_until_flush-with-.patch
@@ -0,0 +1,29 @@
+From da5bf657823ed2f5a790363b5338f30be68de62b Mon Sep 17 00:00:00 2001
+From: Alexandre Derumier <aderumier at odiso.com>
+Date: Tue, 26 Jul 2016 16:51:00 +0200
+Subject: [PATCH] rbd: disable rbd_cache_writethrough_until_flush with
+ cache=unsafe
+
+Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
+---
+ block/rbd.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/block/rbd.c b/block/rbd.c
+index 5bc5b32..5656028 100644
+--- a/block/rbd.c
++++ b/block/rbd.c
+@@ -544,6 +544,10 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
+         rados_conf_set(s->cluster, "rbd_cache", "true");
+     }
+ 
++    if (flags & BDRV_O_NO_FLUSH) {
++	rados_conf_set(s->cluster, "rbd_cache_writethrough_until_flush", "false");
++    }
++
+     r = rados_connect(s->cluster);
+     if (r < 0) {
+         error_setg(errp, "error connecting");
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 3614309..c77c5da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -51,6 +51,7 @@ pve/0050-fix-possible-unitialised-return-value.patch
 pve/0051-net-NET_CLIENT_OPTIONS_KIND_MAX-changed.patch
 pve/0052-vnc-refactor-to-QIOChannelSocket.patch
 pve/0053-vma-use-BlockBackend-on-extract.patch
+pve/0054-rbd-disable-rbd_cache_writethrough_until_flush-with-.patch
 #see https://bugs.launchpad.net/qemu/+bug/1488363?comments=all
 extra/0001-Revert-target-i386-disable-LINT0-after-reset.patch
 extra/0001-i386-kvmvapic-initialise-imm32-variable.patch
-- 
2.1.4