summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrutika Dhananjay <kdhananj@redhat.com>2016-06-02 19:45:03 +0530
committerPranith Kumar Karampuri <pkarampu@redhat.com>2016-06-15 04:15:52 -0700
commitc1dfc0ca9d06ef9560950c6d374f8e9ed0a53fcd (patch)
treead46a08aa5e39832a0026bc8ed751da4a3ad5651
parent45ae064a03e9d7864316723d7c258698f03dbc52 (diff)
posix, shard: Use page-aligned buffer for o-direct reads
Backport of: http://review.gluster.org/#/c/14639/ and also make shard_readv_do() pass the correct flags when the original fd is opened with O_DIRECT. Change-Id: I253f74459656b047de652b6aace487c0e2ac71f6 BUG: 1342903 Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com> Reviewed-on: http://review.gluster.org/14650 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: Pranith Kumar Karampuri <pkarampu@redhat.com>
-rw-r--r--xlators/features/shard/src/shard.c3
-rw-r--r--xlators/storage/posix/src/posix.c40
2 files changed, 35 insertions, 8 deletions
diff --git a/xlators/features/shard/src/shard.c b/xlators/features/shard/src/shard.c
index 14177a3..df84124 100644
--- a/xlators/features/shard/src/shard.c
+++ b/xlators/features/shard/src/shard.c
@@ -3010,6 +3010,9 @@ shard_readv_do (call_frame_t *frame, xlator_t *this)
SHARD_SET_ROOT_FS_ID (frame, local);
+ if (fd->flags & O_DIRECT)
+ local->flags = O_DIRECT;
+
while (cur_block <= last_block) {
if (wind_failed) {
shard_readv_do_cbk (frame, (void *) (long) 0, this, -1,
diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c
index 582589b..3197ee0 100644
--- a/xlators/storage/posix/src/posix.c
+++ b/xlators/storage/posix/src/posix.c
@@ -2977,6 +2977,8 @@ posix_readv (call_frame_t *frame, xlator_t *this,
int32_t op_ret = -1;
int32_t op_errno = 0;
int _fd = -1;
+ char *buf = NULL;
+ char *alloc_buf = NULL;
struct posix_private * priv = NULL;
struct iobuf * iobuf = NULL;
struct iobref * iobref = NULL;
@@ -3015,14 +3017,35 @@ posix_readv (call_frame_t *frame, xlator_t *this,
}
_fd = pfd->fd;
- op_ret = pread (_fd, iobuf->ptr, size, offset);
- if (op_ret == -1) {
- op_errno = errno;
- gf_msg (this->name, GF_LOG_ERROR, errno, P_MSG_READ_FAILED,
- "read failed on gfid=%s, fd=%p, offset=%"PRIu64" "
- "size=%"GF_PRI_SIZET"", uuid_utoa (fd->inode->gfid), fd,
- offset, size);
- goto out;
+ if (pfd->flags & O_DIRECT) {
+ alloc_buf = _page_aligned_alloc (size, &buf);
+ if (!alloc_buf) {
+ op_ret = -1;
+ op_errno = errno;
+ goto out;
+ }
+
+ op_ret = pread (_fd, buf, size, offset);
+ if (op_ret == -1) {
+ op_errno = errno;
+ gf_msg (this->name, GF_LOG_ERROR, errno,
+ P_MSG_READ_FAILED, "read failed on gfid=%s, "
+ "fd=%p, offset=%"PRIu64" size=%"GF_PRI_SIZET", "
+ "buf=%p", uuid_utoa (fd->inode->gfid), fd,
+ offset, size, buf);
+ goto out;
+ }
+ memcpy(iobuf->ptr, buf, size);
+ } else {
+ op_ret = pread (_fd, iobuf->ptr, size, offset);
+ if (op_ret == -1) {
+ op_errno = errno;
+ gf_msg (this->name, GF_LOG_ERROR, errno, P_MSG_READ_FAILED,
+ "read failed on gfid=%s, fd=%p, offset=%"PRIu64" "
+ "size=%"GF_PRI_SIZET"", uuid_utoa (fd->inode->gfid), fd,
+ offset, size);
+ goto out;
+ }
}
LOCK (&priv->lock);
@@ -3065,6 +3088,7 @@ out:
iobref_unref (iobref);
if (iobuf)
iobuf_unref (iobuf);
+ GF_FREE (alloc_buf);
return 0;
}