From 34056a0740d87e0b56e40fbf53b46443b0c9c444 Mon Sep 17 00:00:00 2001 From: Krutika Dhananjay Date: Fri, 13 May 2016 15:18:22 +0530 Subject: Revert "features/shard: Make o-direct writes work with sharding" Backport of: http://review.gluster.org/#/c/14328/ This reverts commit c272c71391cea9db817f4e7e38cfc25a7cff8bd5. This is for two reasons: 1) It introduces high fop latencies 2) Even with the patch, there is no true odirect behavior since the workaround in the patch doesn't reduce the caching done in kernel's page cache as far as writes on anon fds associated with individual shards is concerned. Change-Id: Ia39f8f30a46a7559eafbb31658aed8c8985be593 BUG: 1335821 Signed-off-by: Krutika Dhananjay Reviewed-on: http://review.gluster.org/14329 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Pranith Kumar Karampuri --- xlators/features/shard/src/shard.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'xlators/features') diff --git a/xlators/features/shard/src/shard.c b/xlators/features/shard/src/shard.c index 78bb82d923e..c7a57e08645 100644 --- a/xlators/features/shard/src/shard.c +++ b/xlators/features/shard/src/shard.c @@ -3591,7 +3591,6 @@ shard_common_inode_write_do (call_frame_t *frame, xlator_t *this) shard_local_t *local = NULL; struct iovec *vec = NULL; gf_boolean_t wind_failed = _gf_false; - gf_boolean_t odirect = _gf_false; off_t orig_offset = 0; off_t shard_offset = 0; off_t vec_offset = 0; @@ -3622,9 +3621,6 @@ shard_common_inode_write_do (call_frame_t *frame, xlator_t *this) return 0; } - if ((fd->flags & O_DIRECT) && (local->fop == GF_FOP_WRITE)) - odirect = _gf_true; - while (cur_block <= last_block) { if (wind_failed) { shard_common_inode_write_do_cbk (frame, @@ -3682,8 +3678,6 @@ shard_common_inode_write_do (call_frame_t *frame, xlator_t *this) NULL, NULL); goto next; } - if (odirect) - local->flags |= O_SYNC; } shard_common_inode_write_wind (frame, this, anon_fd, -- cgit