andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nl-cache: Fix the issue in refd_inode counting and prune the cache

Browse Source 
Change-Id: I5b9beb8502667bc3876385900bc01b6491348716
BUG: 1442569
Signed-off-by: Poornima G <pgurusid@redhat.com>
Reviewed-on: https://review.gluster.org/17110
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Tested-by: Pranith Kumar Karampuri <pkarampu@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>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Poornima G 2017-04-25 15:04:34 +05:30 committed by Niels de Vos
parent 4076b73b2f
commit 22e942dd20
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xlators/performance/nl-cache/src/nl-cache-helper.c
View File

@ -558,13 +558,13 @@ __nlc_free_pe (xlator_t *this, nlc_ctx_t *nlc_ctx, nlc_pe_t *pe)
{
uint64_t pe_int = 0;
nlc_conf_t *conf = NULL;
uint64_t *nlc_ctx_int = NULL;
uint64_t nlc_ctx_int = 0;
conf = this->private;
if (pe->inode) {
inode_ctx_reset1 (pe->inode, this, &pe_int);
inode_ctx_get2 (pe->inode, this, nlc_ctx_int, NULL);
inode_ctx_get2 (pe->inode, this, &nlc_ctx_int, NULL);
inode_unref (pe->inode);
}
list_del (&pe->list);
@ -1118,6 +1118,8 @@ nlc_dump_inodectx (xlator_t *this, inode_t *inode)
gf_proc_dump_write ("state", "%"PRIu64, nlc_ctx->state);
gf_proc_dump_write ("timer", "%p", nlc_ctx->timer);
gf_proc_dump_write ("cache-time", "%lld", nlc_ctx->cache_time);
gf_proc_dump_write ("cache-size", "%zu", nlc_ctx->cache_size);
gf_proc_dump_write ("refd-inodes", "%"PRIu64, nlc_ctx->refd_inodes);
if (IS_PE_VALID (nlc_ctx->state))
list_for_each_entry_safe (pe, tmp, &nlc_ctx->pe, list) {
@ -1130,7 +1132,7 @@ nlc_dump_inodectx (xlator_t *this, inode_t *inode)
gf_proc_dump_write ("ne", "%s", ne->name);
}
UNLOCK (&nlc_ctx->lock);
UNLOCK (&nlc_ctx->lock);
}
if (ret && nlc_ctx)

8
xlators/performance/nl-cache/src/nl-cache.c
View File

@ -55,6 +55,8 @@ nlc_dentry_op (call_frame_t *frame, xlator_t *this, gf_boolean_t multilink)
default:
return;
}
nlc_lru_prune (this, NULL);
out:
return;
}
@ -765,10 +767,10 @@ struct volume_options options[] = {
"a while and the cache is cleared based on LRU",
},
{ .key = {"nl-cache-timeout"},
.type = GF_OPTION_TYPE_INT,
.type = GF_OPTION_TYPE_TIME,
.min = 0,
.max = 600,
.default_value = "600",
.max = 1 * GF_DAY_IN_SECONDS,
.default_value = "60",
.description = "Time period after which cache has to be refreshed",
},
{ .key = {NULL} },

3
xlators/performance/nl-cache/src/nl-cache.h
View File

@ -170,4 +170,7 @@ nlc_clear_all_cache (xlator_t *this);
void
nlc_disable_cache (xlator_t *this);
void
nlc_lru_prune (xlator_t *this, inode_t *inode);
#endif /* __NL_CACHE_H__ */