From 922f9df5d7cdb7775dfa6fac4874105d5cc85c98 Mon Sep 17 00:00:00 2001 From: Soumya Koduri Date: Thu, 4 Jun 2015 11:25:35 +0530 Subject: Upcall/cache-invalidation: Ignore fops with frame->root->client not set Server-side internally generated fops like 'quota/marker' will not have any client associated with the frame. Hence we need a check for clients to be valid before processing for upcall cache invalidation. Also fixed an issue with initializing reaper-thread. Added a testcase to test the fix. Change-Id: If7419b98aca383f4b80711c10fef2e0b32498c57 BUG: 1221941 Signed-off-by: Soumya Koduri Reviewed-on: http://review.gluster.org/10909 Reviewed-by: Kaleb KEITHLEY Reviewed-by: jiffin tony Thottan Reviewed-by: Niels de Vos Reviewed-on: http://review.gluster.org/11141 Tested-by: NetBSD Build System --- xlators/features/upcall/src/upcall-internal.c | 25 ++++++++++++++++++++----- xlators/features/upcall/src/upcall.c | 4 +++- 2 files changed, 23 insertions(+), 6 deletions(-) (limited to 'xlators/features/upcall/src') diff --git a/xlators/features/upcall/src/upcall-internal.c b/xlators/features/upcall/src/upcall-internal.c index 19c9f9e5f24..e13097c57c6 100644 --- a/xlators/features/upcall/src/upcall-internal.c +++ b/xlators/features/upcall/src/upcall-internal.c @@ -206,10 +206,13 @@ __upcall_inode_ctx_set (inode_t *inode, xlator_t *this) INIT_LIST_HEAD (&inode_ctx->client_list); inode_ctx->destroy = 0; - ret = __inode_ctx_set (inode, this, (uint64_t *) inode_ctx); - if (ret) + ctx = (long) inode_ctx; + ret = __inode_ctx_set (inode, this, &ctx); + if (ret) { gf_log (this->name, GF_LOG_DEBUG, "failed to set inode ctx (%p)", inode); + goto out; + } /* add this inode_ctx to the global list */ LOCK (&priv->inode_ctx_lk); @@ -241,7 +244,7 @@ __upcall_inode_ctx_get (inode_t *inode, xlator_t *this) goto out; } - inode_ctx = (upcall_inode_ctx_t *)(long) ctx; + inode_ctx = (upcall_inode_ctx_t *) (long) (ctx); out: return inode_ctx; @@ -377,10 +380,10 @@ upcall_cleanup_inode_ctx (xlator_t *this, inode_t *inode) } pthread_mutex_unlock (&inode_ctx->client_list_lock); - pthread_mutex_destroy (&inode_ctx->client_list_lock); - /* Mark the inode_ctx to be destroyed */ inode_ctx->destroy = 1; + gf_msg_debug ("upcall", 0, "set upcall_inode_ctx (%p) to destroy mode", + inode_ctx); } out: @@ -422,8 +425,12 @@ upcall_reaper_thread (void *data) LOCK (&priv->inode_ctx_lk); { /* client list would have been cleaned up*/ + gf_msg_debug ("upcall", 0, "Freeing upcall_inode_ctx (%p)", + inode_ctx); list_del_init (&inode_ctx->inode_ctx_list); + pthread_mutex_destroy (&inode_ctx->client_list_lock); GF_FREE (inode_ctx); + inode_ctx = NULL; } UNLOCK (&priv->inode_ctx_lk); } @@ -474,6 +481,14 @@ upcall_cache_invalidate (call_frame_t *frame, xlator_t *this, client_t *client, if (!is_cache_invalidation_enabled(this)) return; + /* server-side generated fops like quota/marker will not have any + * client associated with them. Ignore such fops. + */ + if (!client) { + gf_msg_debug ("upcall", 0, "Internal fop - client NULL"); + return; + } + up_inode_ctx = ((upcall_local_t *)frame->local)->upcall_inode_ctx; if (!up_inode_ctx) diff --git a/xlators/features/upcall/src/upcall.c b/xlators/features/upcall/src/upcall.c index 5f6c29e1b79..331db52d9ac 100644 --- a/xlators/features/upcall/src/upcall.c +++ b/xlators/features/upcall/src/upcall.c @@ -1581,8 +1581,8 @@ upcall_local_wipe (xlator_t *this, upcall_local_t *local) { if (local) { inode_unref (local->inode); - mem_put (local); loc_wipe (&local->rename_oldloc); + mem_put (local); } } @@ -1634,6 +1634,7 @@ reconfigure (xlator_t *this, dict_t *options) " Disabling cache_invalidation", strerror(errno)); } + priv->reaper_init_done = 1; } out: @@ -1680,6 +1681,7 @@ init (xlator_t *this) " Disabling cache_invalidation", strerror(errno)); } + priv->reaper_init_done = 1; } out: if (ret) { -- cgit