summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPoornima G <pgurusid@redhat.com>2017-06-12 10:59:04 +0530
committerShyamsundar Ranganathan <srangana@redhat.com>2017-06-21 12:48:09 +0000
commit1f4cc8fb8d5647ef923e6cfa7e4f027d6aab97f8 (patch)
tree0d88b99eebfcc3fd3aa457761252b9688ffc3baa
parent6945c9b3dc3afd290ee12cd5f90a6c538b2aaf14 (diff)
readdir-ahead: Fix duplicate listing and cache size calculation
Issue: If a opendir is followed by a closedir without readdir, though the prefetched entries were freed, the freed size was not accounted in priv->rda_cache_size. Thus the cache limit will exceed if there are multiple opendir followed by closedir. Fix: Fix the pric->rda_cache_size calculation. Also have removed the inode_ctx_size. Each perf xlator has its own cache limit that it works with. Also the inode_ctx size can change, if a forget/ invalidate or any other factor triggers the inode_ctx size. > Reviewed-on: https://review.gluster.org/17504 > Smoke: Gluster Build System <jenkins@build.gluster.org> > NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> > CentOS-regression: Gluster Build System <jenkins@build.gluster.org> > Reviewed-by: Raghavendra G <rgowdapp@redhat.com> > (cherry picked from commit e97c32ee9913969a726f8a8286cf714f907729d6) Change-Id: I9707ec558076ce046e58a55989ec9513c70ea029 BUG: 1460898 Signed-off-by: Poornima G <pgurusid@redhat.com> Reviewed-on: https://review.gluster.org/17529 Reviewed-by: Raghavendra G <rgowdapp@redhat.com> Smoke: Gluster Build System <jenkins@build.gluster.org> 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.c35
1 files changed, 16 insertions, 19 deletions
diff --git a/xlators/performance/readdir-ahead/src/readdir-ahead.c b/xlators/performance/readdir-ahead/src/readdir-ahead.c
index 4e7f2b9..8827b8b 100644
--- a/xlators/performance/readdir-ahead/src/readdir-ahead.c
+++ b/xlators/performance/readdir-ahead/src/readdir-ahead.c
@@ -74,14 +74,21 @@ out:
* Reset the tracking state of the context.
*/
static void
-rda_reset_ctx(struct rda_fd_ctx *ctx)
+rda_reset_ctx(xlator_t *this, struct rda_fd_ctx *ctx)
{
+ struct rda_priv *priv = NULL;
+
+ priv = this->private;
+
ctx->state = RDA_FD_NEW;
ctx->cur_offset = 0;
- ctx->cur_size = 0;
ctx->next_offset = 0;
ctx->op_errno = 0;
+
gf_dirent_free(&ctx->entries);
+ priv->rda_cache_size -= ctx->cur_size;
+ ctx->cur_size = 0;
+
if (ctx->xattrs) {
dict_unref (ctx->xattrs);
ctx->xattrs = NULL;
@@ -114,7 +121,7 @@ __rda_fill_readdirp (xlator_t *this, gf_dirent_t *entries, size_t request_size,
struct rda_fd_ctx *ctx)
{
gf_dirent_t *dirent, *tmp;
- size_t dirent_size, size = 0, inodectx_size = 0;
+ size_t dirent_size, size = 0;
int32_t count = 0;
struct rda_priv *priv = NULL;
@@ -125,15 +132,11 @@ __rda_fill_readdirp (xlator_t *this, gf_dirent_t *entries, size_t request_size,
if (size + dirent_size > request_size)
break;
- inodectx_size = 0;
-
- inode_ctx_del (dirent->inode, this, (void *)&inodectx_size);
-
size += dirent_size;
list_del_init(&dirent->list);
ctx->cur_size -= dirent_size;
- priv->rda_cache_size -= (dirent_size + inodectx_size);
+ priv->rda_cache_size -= dirent_size;
list_add_tail(&dirent->list, &entries->list);
ctx->cur_offset = dirent->d_off;
@@ -205,7 +208,7 @@ rda_readdirp(call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size,
* completed, reset the context and kickstart the filler again.
*/
if (!off && (ctx->state & RDA_FD_EOD) && (ctx->cur_size == 0)) {
- rda_reset_ctx(ctx);
+ rda_reset_ctx(this, ctx);
/*
* Unref and discard the 'list of xattrs to be fetched'
* stored during opendir call. This is done above - inside
@@ -251,6 +254,8 @@ rda_readdirp(call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size,
if (!(ctx->state & RDA_FD_RUNNING)) {
fill = 1;
+ if (!ctx->xattrs)
+ ctx->xattrs = dict_ref (xdata);
ctx->state |= RDA_FD_RUNNING;
}
}
@@ -290,7 +295,6 @@ rda_fill_fd_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
struct rda_fd_ctx *ctx = local->ctx;
struct rda_priv *priv = this->private;
int fill = 1;
- size_t inodectx_size = 0;
size_t dirent_size = 0;
int ret = 0;
gf_boolean_t serve = _gf_false;
@@ -317,17 +321,10 @@ rda_fill_fd_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
list_add_tail(&dirent->list, &ctx->entries.list);
dirent_size = gf_dirent_size (dirent->d_name);
- inodectx_size = 0;
-
- if (dirent->inode) {
- inodectx_size = inode_ctx_size (dirent->inode);
- inode_ctx_set (dirent->inode, this,
- (void *)inodectx_size);
- }
ctx->cur_size += dirent_size;
- priv->rda_cache_size += (dirent_size + inodectx_size);
+ priv->rda_cache_size += dirent_size;
ctx->next_offset = dirent->d_off;
}
@@ -592,7 +589,7 @@ rda_releasedir(xlator_t *this, fd_t *fd)
if (!ctx)
return 0;
- rda_reset_ctx(ctx);
+ rda_reset_ctx(this, ctx);
if (ctx->fill_frame)
STACK_DESTROY(ctx->fill_frame->root);