diff options
| author | Krutika Dhananjay <kdhananj@redhat.com> | 2016-05-02 16:51:10 +0530 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2016-06-16 09:04:10 -0700 |
| commit | 9af36b95976d4e54859c9b60bd2e711518b3be6e (patch) | |
| tree | 98b4c7fa8b0c96cfabce8d59b1df34e64f9d6a44 /xlators/features/shard | |
| parent | 650459c4178eff6fba82351d044c995ab7d046b1 (diff) | |
core, shard: Make shards inherit main file's O_DIRECT flag if present
Backport of: http://review.gluster.org/14191
If the application opens a file with O_DIRECT, the shards'
anon fds would also need to inherit the flag. Towards this,
shard xl would be passing the odirect flag in the @flags parameter
to the WRITEV fop. This will be used in anon fd resolution
and subsequent opening by posix xl.
Change-Id: I3a0593fa46cc25e390a5762a0354b469c2a1532d
BUG: 1342903
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-on: http://review.gluster.org/14663
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'xlators/features/shard')
| -rw-r--r-- | xlators/features/shard/src/shard.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/xlators/features/shard/src/shard.c b/xlators/features/shard/src/shard.c index d3e8ba330f4..c82fd0a31f1 100644 --- a/xlators/features/shard/src/shard.c +++ b/xlators/features/shard/src/shard.c @@ -3635,6 +3635,7 @@ 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; @@ -3665,6 +3666,9 @@ 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, @@ -3722,6 +3726,13 @@ shard_common_inode_write_do (call_frame_t *frame, xlator_t *this) NULL, NULL); goto next; } + + if (local->fop == GF_FOP_WRITE) { + if (odirect) + local->flags = O_DIRECT; + else + local->flags = GF_ANON_FD_FLAGS; + } } shard_common_inode_write_wind (frame, this, anon_fd, |