diff options
| author | Poornima G <pgurusid@redhat.com> | 2017-03-27 11:38:28 +0530 |
|---|---|---|
| committer | Raghavendra G <rgowdapp@redhat.com> | 2017-04-05 02:24:32 -0400 |
| commit | 61f76f318faed395660f5bbcfe39616b39c158f0 (patch) | |
| tree | ff8edaec3f8eedb6e119bac8c8f3715ad30b3eb0 | |
| parent | 1063efeb2275039a75eb6fe5e423845e28098df2 (diff) | |
reddir-ahead: Fix EOD propagation problem
In readdirp fop, op_errno is overloaded to indicate the EOD detection.
If op_errno contains ENOENT, then it indicates that there are no
further entries pending read in the directory. Currently NFS uses the
ENOENT to identify the EOD.
Issue:
NFS clients issues a 4K buffer for readdirp, readdir-ahead converts it
to 128K buffer as its reading ahead. If there are 100 entries in the
bricks, 128K can get all 100 and store in readdir-ahead, but only 23
entries that can be fit in 4K will be sent to NFS. Since the whole
100 entries were read from brick, the op_errno is set to ENOENT, and
the op_errno is propagated as is when sent to NFS. Hence NFS client
in reading 23 entries thinks it reached EOD.
Solution:
Do not propogate ENOENT errno, unless all the entries are read
from the readdir ahead buffer.
Change-Id: I4f173a77b21ab9e98ae35e291a45b8fc0cde65bd
BUG: 1436086
Signed-off-by: Poornima G <pgurusid@redhat.com>
Reviewed-on: https://review.gluster.org/16953
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
| -rw-r--r-- | xlators/performance/readdir-ahead/src/readdir-ahead.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/xlators/performance/readdir-ahead/src/readdir-ahead.c b/xlators/performance/readdir-ahead/src/readdir-ahead.c index 9b0870e2b37..9f129aa08d8 100644 --- a/xlators/performance/readdir-ahead/src/readdir-ahead.c +++ b/xlators/performance/readdir-ahead/src/readdir-ahead.c @@ -236,6 +236,10 @@ rda_readdirp(call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, ret = __rda_serve_readdirp (this, ctx, size, &entries, &op_errno); serve = _gf_true; + + if (op_errno == ENOENT && !((ctx->state & RDA_FD_EOD) && + (ctx->cur_size == 0))) + op_errno = 0; } else { ctx->stub = fop_readdirp_stub (frame, NULL, fd, size, off, xdata); @@ -380,6 +384,10 @@ out: ctx->fill_frame = NULL; } + if (op_errno == ENOENT && !((ctx->state & RDA_FD_EOD) && + (ctx->cur_size == 0))) + op_errno = 0; + UNLOCK(&ctx->lock); if (serve) { |