Patchwork [03/11] quorum: Add quorum_open() and quorum_close().

login
register
mail settings
Submitter Benoît Canet
Date Oct. 23, 2012, 12:23 p.m.
Message ID <1350995029-29128-4-git-send-email-benoit@irqsave.net>
Download mbox | patch
Permalink /patch/193489/
State New
Headers show

Comments

Benoît Canet - Oct. 23, 2012, 12:23 p.m.
Valid quorum resources look like
quorum:threshold/total:path/to/image_1: ... :path/to/image_total

':' is used as a separator to allow to use networked path
'\' is the escaping character for filename containing ':'
'\' escape itself

On the command line for quorum files "img,test.raw", "img2.raw"
and "img3.raw" invocation look like:

-drive file=quorum:2/3:img\\:test.raw:img2.raw:img3.raw
(note the double \\)

Signed-off-by: Benoit Canet <benoit@irqsave.net>
---
 block/quorum.c |  122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 122 insertions(+)
Eric Blake - Oct. 23, 2012, 3:32 p.m.
On 10/23/2012 06:23 AM, Benoît Canet wrote:
> Valid quorum resources look like
> quorum:threshold/total:path/to/image_1: ... :path/to/image_total
> 
> ':' is used as a separator to allow to use networked path
> '\' is the escaping character for filename containing ':'
> '\' escape itself
> 
> On the command line for quorum files "img,test.raw", "img2.raw"

Here, you used a comma,

> and "img3.raw" invocation look like:
> 
> -drive file=quorum:2/3:img\\:test.raw:img2.raw:img3.raw

but here, you are using a colon for the underlying name 'img:test.raw'.

> (note the double \\)

You also didn't give an example of comma escaping using typical command
line comma escaping; but at least your example looks okay once you fix
the typo in the lead-in text.  The code appears to match the commit message.

Patch

diff --git a/block/quorum.c b/block/quorum.c
index 19a9a44..7b20f08 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -52,11 +52,133 @@  struct QuorumAIOCB {
     int vote_ret;
 };
 
+/* Valid quorum resources look like
+ * quorum:threshold/total:path/to/image_1: ... :path/to/image_total
+ *
+ * ':' is used as a separator
+ * '\' is the escaping character for filename containing ':'
+ */
+static int quorum_open(BlockDriverState *bs, const char *filename, int flags)
+{
+    BDRVQuorumState *s = bs->opaque;
+    int i, j, k, len, ret = 0;
+    char *a, *b, *names;
+    const char *start;
+    bool escape;
+
+    /* Parse the quorum: prefix */
+    if (!strstart(filename, "quorum:", &start)) {
+        return -EINVAL;
+    }
+
+    /* Get threshold */
+    errno = 0;
+    s->threshold = strtoul(start, &a, 10);
+    if (*a != '/' || errno) {
+        return -EINVAL;
+    }
+    a++;
+
+    /* Get total */
+    errno = 0;
+    s->total = strtoul(a, &b, 10);
+    if (*b != ':' || errno) {
+        return -EINVAL;
+    }
+    b++;
+
+    if (s->threshold < 1 || s->total < 2) {
+        return -EINVAL;
+    }
+
+    if (s->threshold > s->total) {
+        return -EINVAL;
+    }
+
+    s->bs = g_malloc0(sizeof(BlockDriverState *) * s->total);
+    /* Two allocations for all filenames: simpler to free */
+    s->filenames = g_malloc0(sizeof(char *) * s->total);
+    names = g_strdup(b);
+
+    /* Get the filenames pointers */
+    escape = false;
+    s->filenames[0] = names;
+    len = strlen(names);
+    for (i = j = k = 0; i < len && j < s->total; i++) {
+        /* separation between two files */
+        if (!escape && names[i] == ':') {
+            char *prev = s->filenames[j];
+            prev[k] = '\0';
+            s->filenames[++j] = prev + k + 1;
+            k = 0;
+            continue;
+        }
+
+        escape = !escape && names[i] == '\\';
+
+        /* if we are not escaping copy */
+        if (!escape) {
+            s->filenames[j][k++] = names[i];
+        }
+    }
+    /* terminate last string */
+    s->filenames[j][k] = '\0';
+
+    if ((j + 1) != s->total) {
+        ret = -EINVAL;
+        goto free_exit;
+    }
+
+    /* Open files */
+    for (i = 0; i < s->total; i++) {
+        s->bs[i] = bdrv_new("");
+        ret = bdrv_open(s->bs[i], s->filenames[i], flags, NULL);
+        if (ret < 0) {
+            goto error_exit;
+        }
+    }
+
+    goto exit;
+
+error_exit:
+    for (; i >= 0; i--) {
+        bdrv_delete(s->bs[i]);
+        s->bs[i] = NULL;
+    }
+free_exit:
+    g_free(s->filenames[0]);
+    g_free(s->filenames);
+    s->filenames = NULL;
+    g_free(s->bs);
+exit:
+    return ret;
+}
+
+static void quorum_close(BlockDriverState *bs)
+{
+    BDRVQuorumState *s = bs->opaque;
+    int i;
+
+    for (i = 0; i < s->total; i++) {
+        /* Ensure writes reach stable storage */
+        bdrv_flush(s->bs[i]);
+        bdrv_delete(s->bs[i]);
+    }
+
+    g_free(s->filenames[0]);
+    g_free(s->filenames);
+    s->filenames = NULL;
+    g_free(s->bs);
+}
+
 static BlockDriver bdrv_quorum = {
     .format_name        = "quorum",
     .protocol_name      = "quorum",
 
     .instance_size      = sizeof(BDRVQuorumState),
+
+    .bdrv_file_open     = quorum_open,
+    .bdrv_close         = quorum_close,
 };
 
 static void bdrv_quorum_init(void)