vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sheepdog: pass copy_policy in the request 

Currently copy_policy isn't used. Recent sheepdog supports erasure coding, which
make use of copy_policy internally, but require client explicitly passing
copy_policy from base inode to newly creately inode for snapshot related
operations.

If connected sheep daemon doesn't utilize copy_policy, passing it to sheep
daemon is just one extra null effect operation. So no compatibility problem.

With this patch, sheepdog can provide erasure coded volume for QEMU VM.

Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Liu Yuan <namei.unix@gmail.com>
Acked-by: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
master
Liu Yuan 2013-10-23 16:51:52 +08:00 committed by Kevin Wolf
parent 29a67f7e92
commit 1841f8801c
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
block/sheepdog.c
View File

@ -126,7 +126,8 @@ typedef struct SheepdogObjReq {
uint64_t oid; uint64_t oid;
uint64_t cow_oid; uint64_t cow_oid;
uint8_t copies; uint8_t copies;
uint8_t reserved[7]; uint8_t copy_policy;
uint8_t reserved[6];
uint64_t offset; uint64_t offset;
} SheepdogObjReq; } SheepdogObjReq;
@ -139,7 +140,8 @@ typedef struct SheepdogObjRsp {
uint32_t data_length; uint32_t data_length;
uint32_t result; uint32_t result;
uint8_t copies; uint8_t copies;
uint8_t reserved[3]; uint8_t copy_policy;
uint8_t reserved[2];
uint32_t pad[6]; uint32_t pad[6];
} SheepdogObjRsp; } SheepdogObjRsp;
@ -153,7 +155,8 @@ typedef struct SheepdogVdiReq {
uint64_t vdi_size; uint64_t vdi_size;
uint32_t vdi_id; uint32_t vdi_id;
uint8_t copies; uint8_t copies;
uint8_t reserved[3]; uint8_t copy_policy;
uint8_t reserved[2];
uint32_t snapid; uint32_t snapid;
uint32_t pad[3]; uint32_t pad[3];
} SheepdogVdiReq; } SheepdogVdiReq;
@ -1346,7 +1349,8 @@ out:
} }
static int do_sd_create(BDRVSheepdogState *s, char *filename, int64_t vdi_size, static int do_sd_create(BDRVSheepdogState *s, char *filename, int64_t vdi_size,
uint32_t base_vid, uint32_t *vdi_id, int snapshot) uint32_t base_vid, uint32_t *vdi_id, int snapshot,
uint8_t copy_policy)
{ {
SheepdogVdiReq hdr; SheepdogVdiReq hdr;
SheepdogVdiRsp *rsp = (SheepdogVdiRsp *)&hdr; SheepdogVdiRsp *rsp = (SheepdogVdiRsp *)&hdr;
@ -1376,6 +1380,7 @@ static int do_sd_create(BDRVSheepdogState *s, char *filename, int64_t vdi_size,
hdr.data_length = wlen; hdr.data_length = wlen;
hdr.vdi_size = vdi_size; hdr.vdi_size = vdi_size;
hdr.copy_policy = copy_policy;
ret = do_req(fd, (SheepdogReq *)&hdr, buf, &wlen, &rlen); ret = do_req(fd, (SheepdogReq *)&hdr, buf, &wlen, &rlen);
@ -1528,7 +1533,8 @@ static int sd_create(const char *filename, QEMUOptionParameter *options,
bdrv_unref(bs); bdrv_unref(bs);
} }
ret = do_sd_create(s, vdi, vdi_size, base_vid, &vid, 0); /* TODO: allow users to specify copy number */
ret = do_sd_create(s, vdi, vdi_size, base_vid, &vid, 0, 0);
if (!prealloc || ret) { if (!prealloc || ret) {
goto out; goto out;
} }
@ -1718,7 +1724,7 @@ static int sd_create_branch(BDRVSheepdogState *s)
*/ */
deleted = sd_delete(s); deleted = sd_delete(s);
ret = do_sd_create(s, s->name, s->inode.vdi_size, s->inode.vdi_id, &vid, ret = do_sd_create(s, s->name, s->inode.vdi_size, s->inode.vdi_id, &vid,
!deleted); !deleted, s->inode.copy_policy);
if (ret) { if (ret) {
goto out; goto out;
} }
@ -2008,7 +2014,7 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info)
} }
ret = do_sd_create(s, s->name, s->inode.vdi_size, s->inode.vdi_id, &new_vid, ret = do_sd_create(s, s->name, s->inode.vdi_size, s->inode.vdi_id, &new_vid,
1); 1, s->inode.copy_policy);
if (ret < 0) { if (ret < 0) {
error_report("failed to create inode for snapshot. %s", error_report("failed to create inode for snapshot. %s",
strerror(errno)); strerror(errno));