diff options
| author | Krutika Dhananjay <kdhananj@redhat.com> | 2016-01-13 16:19:15 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2016-01-22 22:02:32 -0800 |
| commit | e67712c06b64fb659824b3f79164f2789693acee (patch) | |
| tree | be6c735bb977bd8c486a80649a9237773c140192 /xlators/features | |
| parent | ea94b2b8767e0d477a672355d758e0e8393362ee (diff) | |
features/shard: Implement zerofill FOP
Change-Id: Iabb89a502cc560edd7fe3755623c74a2ccb853d5
BUG: 1261841
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-on: http://review.gluster.org/13234
Smoke: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators/features')
| -rw-r--r-- | xlators/features/shard/src/shard.c | 53 |
1 files changed, 35 insertions, 18 deletions
diff --git a/xlators/features/shard/src/shard.c b/xlators/features/shard/src/shard.c index 89a47ef2ce2..e46d4dc33ec 100644 --- a/xlators/features/shard/src/shard.c +++ b/xlators/features/shard/src/shard.c @@ -498,6 +498,10 @@ shard_common_inode_write_failure_unwind (glusterfs_fop_t fop, SHARD_STACK_UNWIND (fallocate, frame, op_ret, op_errno, NULL, NULL, NULL); break; + case GF_FOP_ZEROFILL: + SHARD_STACK_UNWIND (zerofill, frame, op_ret, op_errno, + NULL, NULL, NULL); + break; default: gf_msg (THIS->name, GF_LOG_WARNING, 0, SHARD_MSG_INVALID_FOP, "Invalid fop id = %d", fop); @@ -523,6 +527,10 @@ shard_common_inode_write_success_unwind (glusterfs_fop_t fop, SHARD_STACK_UNWIND (fallocate, frame, op_ret, 0, &local->prebuf, &local->postbuf, local->xattr_rsp); break; + case GF_FOP_ZEROFILL: + SHARD_STACK_UNWIND (zerofill, frame, op_ret, 0, &local->prebuf, + &local->postbuf, local->xattr_rsp); + break; default: gf_msg (THIS->name, GF_LOG_WARNING, 0, SHARD_MSG_INVALID_FOP, "Invalid fop id = %d", fop); @@ -3520,7 +3528,7 @@ shard_common_inode_write_do_cbk (call_frame_t *frame, void *cookie, int shard_common_inode_write_wind (call_frame_t *frame, xlator_t *this, - fd_t *anon_fd, struct iovec *vec, int count, + fd_t *fd, struct iovec *vec, int count, off_t shard_offset, size_t size) { shard_local_t *local = NULL; @@ -3529,19 +3537,25 @@ shard_common_inode_write_wind (call_frame_t *frame, xlator_t *this, switch (local->fop) { case GF_FOP_WRITE: - STACK_WIND_COOKIE (frame, shard_common_inode_write_do_cbk, - anon_fd, FIRST_CHILD(this), - FIRST_CHILD(this)->fops->writev, anon_fd, - vec, count, shard_offset, local->flags, + STACK_WIND_COOKIE (frame, shard_common_inode_write_do_cbk, fd, + FIRST_CHILD(this), + FIRST_CHILD(this)->fops->writev, fd, vec, + count, shard_offset, local->flags, local->iobref, local->xattr_req); break; case GF_FOP_FALLOCATE: - STACK_WIND_COOKIE (frame, shard_common_inode_write_do_cbk, - anon_fd, FIRST_CHILD(this), - FIRST_CHILD(this)->fops->fallocate, anon_fd, + STACK_WIND_COOKIE (frame, shard_common_inode_write_do_cbk, fd, + FIRST_CHILD(this), + FIRST_CHILD(this)->fops->fallocate, fd, local->flags, shard_offset, size, local->xattr_req); break; + case GF_FOP_ZEROFILL: + STACK_WIND_COOKIE (frame, shard_common_inode_write_do_cbk, fd, + FIRST_CHILD(this), + FIRST_CHILD(this)->fops->zerofill, fd, + shard_offset, size, local->xattr_req); + break; default: gf_msg (this->name, GF_LOG_WARNING, 0, SHARD_MSG_INVALID_FOP, "Invalid fop id = %d", local->fop); @@ -4479,6 +4493,11 @@ shard_common_inode_write_begin (call_frame_t *frame, xlator_t *this, FIRST_CHILD(this)->fops->fallocate, fd, flags, offset, len, xdata); break; + case GF_FOP_ZEROFILL: + STACK_WIND_TAIL (frame, FIRST_CHILD(this), + FIRST_CHILD(this)->fops->zerofill, + fd, offset, len, xdata); + break; default: gf_msg (this->name, GF_LOG_WARNING, 0, SHARD_MSG_INVALID_FOP, "Invalid fop id = %d", fop); @@ -4573,24 +4592,22 @@ shard_fallocate (call_frame_t *frame, xlator_t *this, fd_t *fd, } int -shard_discard (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset, - size_t len, dict_t *xdata) +shard_zerofill (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset, + off_t len, dict_t *xdata) { - /* TBD */ - gf_msg (this->name, GF_LOG_INFO, ENOTSUP, SHARD_MSG_FOP_NOT_SUPPORTED, - "discard called on %s.", uuid_utoa (fd->inode->gfid)); - SHARD_STACK_UNWIND (discard, frame, -1, ENOTSUP, NULL, NULL, NULL); + shard_common_inode_write_begin (frame, this, GF_FOP_ZEROFILL, fd, NULL, + 0, offset, 0, len, NULL, xdata); return 0; } int -shard_zerofill (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset, - off_t len, dict_t *xdata) +shard_discard (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset, + size_t len, dict_t *xdata) { /* TBD */ gf_msg (this->name, GF_LOG_INFO, ENOTSUP, SHARD_MSG_FOP_NOT_SUPPORTED, - "zerofill called on %s.", uuid_utoa (fd->inode->gfid)); - SHARD_STACK_UNWIND (zerofill, frame, -1, ENOTSUP, NULL, NULL, NULL); + "discard called on %s.", uuid_utoa (fd->inode->gfid)); + SHARD_STACK_UNWIND (discard, frame, -1, ENOTSUP, NULL, NULL, NULL); return 0; } |