diff options
| author | Krutika Dhananjay <kdhananj@redhat.com> | 2015-08-26 09:27:42 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2015-08-29 23:51:36 -0700 |
| commit | d304916ddf3d6848787c3a668cc36e3395b32069 (patch) | |
| tree | 2d5ccf29604d08488076eb1c018ad9346a44cb2f /xlators | |
| parent | a5f00c1c29f71bd9135bba38bd0602a1e8ce71b7 (diff) | |
features/shard: Fix size update for writes at hole region
Change-Id: Iceccef8f3f466c7ffb9991f8eb248b81e7b80efb
BUG: 1256580
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-on: http://review.gluster.org/12020
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/features/shard/src/shard.c | 11 | ||||
| -rw-r--r-- | xlators/features/shard/src/shard.h | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/xlators/features/shard/src/shard.c b/xlators/features/shard/src/shard.c index ba1579f1170..2c893cc1101 100644 --- a/xlators/features/shard/src/shard.c +++ b/xlators/features/shard/src/shard.c @@ -2929,6 +2929,13 @@ shard_writev_do_cbk (call_frame_t *frame, void *cookie, xlator_t *this, SHARD_STACK_UNWIND (writev, frame, local->written_size, local->op_errno, NULL, NULL, NULL); } else { + if (local->is_write_extending) + local->delta_size = (local->offset + + local->total_size) - + local->prebuf.ia_size; + else + local->delta_size = 0; + local->hole_size = 0; if (xdata) local->xattr_rsp = dict_ref (xdata); shard_update_file_size (frame, this, local->fd, NULL, @@ -3102,8 +3109,8 @@ shard_post_lookup_writev_handler (call_frame_t *frame, xlator_t *this) /* At this point, calculate the size of the hole if it is going to be * created as part of this write. */ - if (local->offset > local->prebuf.ia_size) - local->hole_size = local->offset - local->prebuf.ia_size; + if (local->offset + local->total_size > local->prebuf.ia_size) + local->is_write_extending = _gf_true; if (local->create_count) shard_common_resume_mknod (frame, this, diff --git a/xlators/features/shard/src/shard.h b/xlators/features/shard/src/shard.h index 61255cd4936..ca57c033167 100644 --- a/xlators/features/shard/src/shard.h +++ b/xlators/features/shard/src/shard.h @@ -180,6 +180,7 @@ typedef struct shard_local { struct iobuf *iobuf; gf_dirent_t entries_head; gf_boolean_t list_inited; + gf_boolean_t is_write_extending; shard_post_fop_handler_t handler; shard_post_lookup_shards_fop_handler_t pls_fop_handler; shard_post_resolve_fop_handler_t post_res_handler; |