From b25eba06d5d50543975d24a0dc0a3a1934faf40b Mon Sep 17 00:00:00 2001 From: Raghavendra Bhat Date: Thu, 2 Aug 2012 16:23:08 +0530 Subject: protocol/server: use pthread_mutex_trylock while dumping statedumps Change-Id: Iec6f539ee7d36c25aca3960abc6d2611707617c8 BUG: 843821 Signed-off-by: Raghavendra Bhat Reviewed-on: http://review.gluster.com/3774 Tested-by: Gluster Build System Reviewed-by: Anand Avati --- libglusterfs/src/fd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'libglusterfs') diff --git a/libglusterfs/src/fd.c b/libglusterfs/src/fd.c index fede42a74..246539b75 100644 --- a/libglusterfs/src/fd.c +++ b/libglusterfs/src/fd.c @@ -989,10 +989,8 @@ fdtable_dump (fdtable_t *fdtable, char *prefix) ret = pthread_mutex_trylock (&fdtable->lock); - if (ret) { - gf_log ("fd", GF_LOG_WARNING, "Unable to acquire lock"); - return; - } + if (ret) + goto out; memset(key, 0, sizeof(key)); gf_proc_dump_build_key(key, prefix, "refcount"); @@ -1012,6 +1010,12 @@ fdtable_dump (fdtable_t *fdtable, char *prefix) } pthread_mutex_unlock(&fdtable->lock); + +out: + if (ret != 0) + gf_proc_dump_write ("Unable to dump the fdtable", + "(Lock acquistion failed) %p", fdtable); + return; } -- cgit