[sheepdog] [PATCH v2 3/4] sheep: remove nr_copies in {write, read, read_backend}_object
Liu Yuan
namei.unix at gmail.com
Mon Apr 29 13:00:08 CEST 2013
From: Liu Yuan <tailai.ly at taobao.com>
Signed-off-by: Liu Yuan <tailai.ly at taobao.com>
---
sheep/ops.c | 6 +++---
sheep/sheep_priv.h | 8 ++++----
sheep/store.c | 18 ++++++++---------
sheep/vdi.c | 56 +++++++++++++++++++++-------------------------------
4 files changed, 37 insertions(+), 51 deletions(-)
diff --git a/sheep/ops.c b/sheep/ops.c
index 61f52a8..97e1443 100644
--- a/sheep/ops.c
+++ b/sheep/ops.c
@@ -797,14 +797,14 @@ static int local_discard_obj(struct request *req)
{
uint64_t oid = req->rq.obj.oid;
uint32_t vid = oid_to_vid(oid), zero = 0;
- int ret, cp = get_vdi_copy_number(vid), idx = data_oid_to_idx(oid);
+ int ret, idx = data_oid_to_idx(oid);
sd_dprintf("%"PRIx64, oid);
ret = write_object(vid_to_vdi_oid(vid), (char *)&zero, sizeof(zero),
- SD_INODE_HEADER_SIZE + sizeof(vid) * idx, false, cp);
+ SD_INODE_HEADER_SIZE + sizeof(vid) * idx, false);
if (ret != SD_RES_SUCCESS)
return ret;
- if (remove_object(oid, cp) != SD_RES_SUCCESS)
+ if (remove_object(oid) != SD_RES_SUCCESS)
sd_eprintf("failed to remove %"PRIx64, oid);
/*
* Return success even if remove_object fails because we have updated
diff --git a/sheep/sheep_priv.h b/sheep/sheep_priv.h
index b9d6f97..e1a3c3b 100644
--- a/sheep/sheep_priv.h
+++ b/sheep/sheep_priv.h
@@ -328,12 +328,12 @@ bool oid_in_recovery(uint64_t oid);
bool node_in_recovery(void);
int read_backend_object(uint64_t oid, char *data, unsigned int datalen,
- uint64_t offset, int nr_copies);
+ uint64_t offset);
int write_object(uint64_t oid, char *data, unsigned int datalen,
- uint64_t offset, bool create, int nr_copies);
+ uint64_t offset, bool create);
int read_object(uint64_t oid, char *data, unsigned int datalen,
- uint64_t offset, int nr_copies);
-int remove_object(uint64_t oid, int nr_copies);
+ uint64_t offset);
+int remove_object(uint64_t oid);
int exec_local_req(struct sd_req *rq, void *data);
void local_req_init(void);
diff --git a/sheep/store.c b/sheep/store.c
index ec3451c..57b8a14 100644
--- a/sheep/store.c
+++ b/sheep/store.c
@@ -389,7 +389,7 @@ int init_global_pathnames(const char *d, char *argp)
/* Write data to both local object cache (if enabled) and backends */
int write_object(uint64_t oid, char *data, unsigned int datalen,
- uint64_t offset, bool create, int nr_copies)
+ uint64_t offset, bool create)
{
struct sd_req hdr;
int ret;
@@ -417,7 +417,7 @@ forward_write:
hdr.obj.oid = oid;
hdr.obj.offset = offset;
- hdr.obj.copies = nr_copies;
+ hdr.obj.copies = get_vdi_copy_number(oid_to_vid(oid));
ret = exec_local_req(&hdr, data);
if (ret != SD_RES_SUCCESS)
@@ -427,7 +427,7 @@ forward_write:
}
int read_backend_object(uint64_t oid, char *data, unsigned int datalen,
- uint64_t offset, int nr_copies)
+ uint64_t offset)
{
struct sd_req hdr;
struct sd_rsp *rsp = (struct sd_rsp *)&hdr;
@@ -437,7 +437,7 @@ int read_backend_object(uint64_t oid, char *data, unsigned int datalen,
hdr.data_length = datalen;
hdr.obj.oid = oid;
hdr.obj.offset = offset;
- hdr.obj.copies = nr_copies;
+ hdr.obj.copies = get_vdi_copy_number(oid_to_vid(oid));
ret = exec_local_req(&hdr, data);
if (ret != SD_RES_SUCCESS)
@@ -453,7 +453,7 @@ int read_backend_object(uint64_t oid, char *data, unsigned int datalen,
* try read backends
*/
int read_object(uint64_t oid, char *data, unsigned int datalen,
- uint64_t offset, int nr_copies)
+ uint64_t offset)
{
int ret;
@@ -468,19 +468,17 @@ int read_object(uint64_t oid, char *data, unsigned int datalen,
}
forward_read:
- ret = read_backend_object(oid, data, datalen, offset, nr_copies);
-
- return ret;
+ return read_backend_object(oid, data, datalen, offset);
}
-int remove_object(uint64_t oid, int copies)
+int remove_object(uint64_t oid)
{
struct sd_req hdr;
int ret;
sd_init_req(&hdr, SD_OP_REMOVE_OBJ);
hdr.obj.oid = oid;
- hdr.obj.copies = copies;
+ hdr.obj.copies = get_vdi_copy_number(oid_to_vid(oid));
ret = exec_local_req(&hdr, NULL);
if (ret != SD_RES_SUCCESS)
diff --git a/sheep/vdi.c b/sheep/vdi.c
index 527d2b4..1434971 100644
--- a/sheep/vdi.c
+++ b/sheep/vdi.c
@@ -174,13 +174,10 @@ int vdi_exist(uint32_t vid)
{
struct sd_inode *inode;
int ret = 1;
- int nr_copies;
inode = xzalloc(sizeof(*inode));
- nr_copies = get_vdi_copy_number(vid);
-
ret = read_object(vid_to_vdi_oid(vid), (char *)inode,
- sizeof(*inode), 0, nr_copies);
+ sizeof(*inode), 0);
if (ret != SD_RES_SUCCESS) {
sd_eprintf("fail to read vdi inode (%" PRIx32 ")", vid);
ret = 0;
@@ -217,7 +214,7 @@ static int create_vdi_obj(struct vdi_iocb *iocb, uint32_t new_vid,
if (iocb->base_vid) {
ret = read_object(vid_to_vdi_oid(iocb->base_vid), (char *)base,
- sizeof(*base), 0, 0);
+ sizeof(*base), 0);
if (ret != SD_RES_SUCCESS) {
ret = SD_RES_BASE_VDI_READ;
goto out;
@@ -232,7 +229,7 @@ static int create_vdi_obj(struct vdi_iocb *iocb, uint32_t new_vid,
PRIx32, name, cur_vid, iocb->base_vid);
ret = read_object(vid_to_vdi_oid(cur_vid), (char *)cur,
- SD_INODE_HEADER_SIZE, 0, 0);
+ SD_INODE_HEADER_SIZE, 0);
if (ret != SD_RES_SUCCESS) {
sd_printf(SDOG_ERR, "failed");
ret = SD_RES_BASE_VDI_READ;
@@ -274,7 +271,7 @@ static int create_vdi_obj(struct vdi_iocb *iocb, uint32_t new_vid,
if (iocb->create_snapshot && cur_vid != iocb->base_vid) {
ret = write_object(vid_to_vdi_oid(cur_vid), (char *)cur,
- SD_INODE_HEADER_SIZE, 0, false, 0);
+ SD_INODE_HEADER_SIZE, 0, false);
if (ret != 0) {
sd_printf(SDOG_ERR, "failed");
ret = SD_RES_BASE_VDI_READ;
@@ -284,7 +281,7 @@ static int create_vdi_obj(struct vdi_iocb *iocb, uint32_t new_vid,
if (iocb->base_vid) {
ret = write_object(vid_to_vdi_oid(iocb->base_vid), (char *)base,
- SD_INODE_HEADER_SIZE, 0, false, 0);
+ SD_INODE_HEADER_SIZE, 0, false);
if (ret != 0) {
sd_printf(SDOG_ERR, "failed");
ret = SD_RES_BASE_VDI_WRITE;
@@ -293,7 +290,7 @@ static int create_vdi_obj(struct vdi_iocb *iocb, uint32_t new_vid,
}
ret = write_object(vid_to_vdi_oid(new_vid), (char *)new, sizeof(*new),
- 0, true, iocb->nr_copies);
+ 0, true);
if (ret != 0)
ret = SD_RES_VDI_WRITE;
@@ -361,7 +358,7 @@ static int fill_vdi_info_range(uint32_t left, uint32_t right,
{
struct sd_inode *inode;
bool vdi_found = false;
- int nr_copies, ret;
+ int ret;
uint32_t i;
const char *name = iocb->name;
@@ -372,9 +369,8 @@ static int fill_vdi_info_range(uint32_t left, uint32_t right,
goto out;
}
for (i = right - 1; i >= left; i--) {
- nr_copies = get_vdi_copy_number(i);
ret = read_object(vid_to_vdi_oid(i), (char *)inode,
- SD_INODE_HEADER_SIZE, 0, nr_copies);
+ SD_INODE_HEADER_SIZE, 0);
if (ret != SD_RES_SUCCESS)
goto out;
@@ -560,7 +556,6 @@ struct deletion_work {
struct request *req;
uint32_t vid;
- int nr_copies;
int count;
uint32_t *buf;
@@ -575,7 +570,7 @@ static int delete_inode(struct deletion_work *dw)
inode = xzalloc(sizeof(*inode));
ret = read_object(vid_to_vdi_oid(dw->vid), (char *)inode,
- SD_INODE_HEADER_SIZE, 0, dw->nr_copies);
+ SD_INODE_HEADER_SIZE, 0);
if (ret != SD_RES_SUCCESS) {
ret = SD_RES_EIO;
goto out;
@@ -584,7 +579,7 @@ static int delete_inode(struct deletion_work *dw)
memset(inode->name, 0, sizeof(inode->name));
ret = write_object(vid_to_vdi_oid(dw->vid), (char *)inode,
- SD_INODE_HEADER_SIZE, 0, false, dw->nr_copies);
+ SD_INODE_HEADER_SIZE, 0, false);
if (ret != 0) {
ret = SD_RES_EIO;
goto out;
@@ -618,7 +613,6 @@ static void delete_one(struct work *work)
uint32_t vdi_id = *(dw->buf + dw->count - dw->done - 1);
int ret, i, nr_deleted;
struct sd_inode *inode = NULL;
- int nr_copies;
sd_dprintf("%d %d, %16x", dw->done, dw->count, vdi_id);
@@ -628,9 +622,8 @@ static void delete_one(struct work *work)
return;
}
- nr_copies = get_vdi_copy_number(vdi_id);
ret = read_backend_object(vid_to_vdi_oid(vdi_id),
- (void *)inode, sizeof(*inode), 0, nr_copies);
+ (void *)inode, sizeof(*inode), 0);
if (ret != SD_RES_SUCCESS) {
sd_eprintf("cannot find VDI object");
@@ -654,7 +647,7 @@ static void delete_one(struct work *work)
continue;
}
- ret = remove_object(oid, nr_copies);
+ ret = remove_object(oid);
if (ret != SD_RES_SUCCESS)
sd_eprintf("remove object %" PRIx64 " fail, %d", oid,
ret);
@@ -672,7 +665,7 @@ static void delete_one(struct work *work)
memset(inode->name, 0, sizeof(inode->name));
write_object(vid_to_vdi_oid(vdi_id), (void *)inode,
- sizeof(*inode), 0, false, nr_copies);
+ sizeof(*inode), 0, false);
out:
free(inode);
}
@@ -709,7 +702,6 @@ static int fill_vdi_list(struct deletion_work *dw, uint32_t root_vid)
struct sd_inode *inode = NULL;
int done = dw->count;
uint32_t vid;
- int nr_copies;
inode = malloc(SD_INODE_HEADER_SIZE);
if (!inode) {
@@ -720,9 +712,8 @@ static int fill_vdi_list(struct deletion_work *dw, uint32_t root_vid)
dw->buf[dw->count++] = root_vid;
again:
vid = dw->buf[done++];
- nr_copies = get_vdi_copy_number(vid);
ret = read_backend_object(vid_to_vdi_oid(vid), (char *)inode,
- SD_INODE_HEADER_SIZE, 0, nr_copies);
+ SD_INODE_HEADER_SIZE, 0);
if (ret != SD_RES_SUCCESS) {
sd_eprintf("cannot find VDI object");
@@ -751,7 +742,7 @@ out:
static uint64_t get_vdi_root(uint32_t vid, bool *cloned)
{
- int ret, nr_copies;
+ int ret;
struct sd_inode *inode = NULL;
*cloned = false;
@@ -763,9 +754,8 @@ static uint64_t get_vdi_root(uint32_t vid, bool *cloned)
goto out;
}
next:
- nr_copies = get_vdi_copy_number(vid);
ret = read_backend_object(vid_to_vdi_oid(vid), (char *)inode,
- SD_INODE_HEADER_SIZE, 0, nr_copies);
+ SD_INODE_HEADER_SIZE, 0);
if (vid == inode->vdi_id && inode->snap_id == 1
&& inode->parent_vdi_id != 0
@@ -806,7 +796,6 @@ static int start_deletion(struct request *req, uint32_t vid)
dw->count = 0;
dw->vid = vid;
dw->req = req;
- dw->nr_copies = get_vdi_copy_number(vid);
dw->work.fn = delete_one;
dw->work.done = delete_one_done;
@@ -864,7 +853,7 @@ int get_vdi_attr(struct sheepdog_vdi_attr *vattr, int data_len,
struct sheepdog_vdi_attr tmp_attr;
uint64_t oid, hval;
uint32_t end;
- int ret, nr_copies;
+ int ret;
vattr->ctime = create_time;
@@ -878,13 +867,12 @@ int get_vdi_attr(struct sheepdog_vdi_attr *vattr, int data_len,
end = *attrid - 1;
while (*attrid != end) {
oid = vid_to_attr_oid(vid, *attrid);
- nr_copies = get_vdi_copy_number(vid);
ret = read_object(oid, (char *)&tmp_attr,
- sizeof(tmp_attr), 0, nr_copies);
+ sizeof(tmp_attr), 0);
if (ret == SD_RES_NO_OBJ && wr) {
- ret = write_object(oid, (char *)vattr,
- data_len, 0, true, nr_copies);
+ ret = write_object(oid, (char *)vattr, data_len, 0,
+ true);
if (ret)
ret = SD_RES_EIO;
else
@@ -905,7 +893,7 @@ int get_vdi_attr(struct sheepdog_vdi_attr *vattr, int data_len,
else if (delete) {
ret = write_object(oid, (char *)"", 1,
offsetof(struct sheepdog_vdi_attr, name),
- false, nr_copies);
+ false);
if (ret)
ret = SD_RES_EIO;
else
@@ -913,7 +901,7 @@ int get_vdi_attr(struct sheepdog_vdi_attr *vattr, int data_len,
} else if (wr) {
ret = write_object(oid, (char *)vattr,
SD_ATTR_OBJ_SIZE, 0,
- false, nr_copies);
+ false);
if (ret)
ret = SD_RES_EIO;
--
1.7.9.5
More information about the sheepdog
mailing list