Patchwork sheepdog: switch to writethrough mode if cluster doesn't support flush

login
register
mail settings
Submitter MORITA Kazutaka
Date May 2, 2012, 8:26 p.m.
Message ID <1335990367-18749-1-git-send-email-morita.kazutaka@gmail.com>
Download mbox | patch
Permalink /patch/156546/
State New
Headers show

Comments

MORITA Kazutaka - May 2, 2012, 8:26 p.m.
This is necessary for qemu to work with the older version of Sheepdog
which doesn't support SD_OP_FLUSH_VDI.

Signed-off-by: MORITA Kazutaka <morita.kazutaka@gmail.com>
---
 block/sheepdog.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
Kevin Wolf - May 3, 2012, 12:35 p.m.
Am 02.05.2012 22:26, schrieb MORITA Kazutaka:
> This is necessary for qemu to work with the older version of Sheepdog
> which doesn't support SD_OP_FLUSH_VDI.
> 
> Signed-off-by: MORITA Kazutaka <morita.kazutaka@gmail.com>

Thanks, applied to the block branch.

Kevin

Patch

diff --git a/block/sheepdog.c b/block/sheepdog.c
index 0ed6b19..e01d371 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -1678,6 +1678,14 @@  static int coroutine_fn sd_co_flush_to_disk(BlockDriverState *bs)
         return ret;
     }
 
+    if (rsp->result == SD_RES_INVALID_PARMS) {
+        dprintf("disable write cache since the server doesn't support it\n");
+
+        s->cache_enabled = 0;
+        closesocket(s->flush_fd);
+        return 0;
+    }
+
     if (rsp->result != SD_RES_SUCCESS) {
         error_report("%s", sd_strerror(rsp->result));
         return -EIO;