protocol/server: use pthread_mutex_trylock while dumping statedumps

Change-Id: Iec6f539ee7d36c25aca3960abc6d2611707617c8
BUG: 843821
Signed-off-by: Raghavendra Bhat <raghavendra@redhat.com>
Reviewed-on: http://review.gluster.com/3774
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>

2 files changed, 37 insertions, 15 deletions

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;
 }
 
 
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c
index 74dbc17e6..b6519e595 100644
--- a/xlators/protocol/server/src/server.c
+++ b/xlators/protocol/server/src/server.c
@@ -245,6 +245,7 @@ server_fd (xlator_t *this)
         char                 key[GF_DUMP_MAX_BUF_LEN];
         int                  i = 1;
         int                  ret = -1;
+        gf_boolean_t         section_added = _gf_false;
 
         GF_VALIDATE_OR_GOTO ("server", this, out);
 
@@ -256,13 +257,11 @@ server_fd (xlator_t *this)
         }
 
         gf_proc_dump_add_section("xlator.protocol.server.conn");
+        section_added = _gf_true;
 
         ret = pthread_mutex_trylock (&conf->mutex);
-        if (ret) {
-                gf_log("", GF_LOG_WARNING, "Unable to dump fdtable"
-                       " errno: %d", errno);
-                return -1;
-        }
+        if (ret)
+                goto out;
 
         list_for_each_entry (trav, &conf->conns, list) {
                 if (trav->id) {
@@ -288,6 +287,13 @@ server_fd (xlator_t *this)
 
         ret = 0;
 out:
+        if (ret) {
+                if (section_added == _gf_false)
+                        gf_proc_dump_add_section("xlator.protocol.server.conn");
+                gf_proc_dump_write ("Unable to dump the list of connections",
+                                    "(Lock acquisition failed) %s",
+                                    this?this->name:"server");
+        }
         return ret;
 }
 
@@ -366,7 +372,12 @@ server_priv (xlator_t *this)
         if (!conf)
                 return 0;
 
-        pthread_mutex_lock (&conf->mutex);
+        gf_proc_dump_build_key (key, "xlator.protocol.server", "priv");
+        gf_proc_dump_add_section (key);
+
+        ret = pthread_mutex_trylock (&conf->mutex);
+        if (ret != 0)
+                goto out;
         {
                 list_for_each_entry (xprt, &conf->xprt_list, list) {
                         total_read  += xprt->total_bytes_read;
@@ -383,6 +394,11 @@ server_priv (xlator_t *this)
 
         ret = 0;
 out:
+        if (ret)
+                gf_proc_dump_write ("Unable to print priv",
+                                    "(Lock acquisition failed) %s",
+                                    this?this->name:"server");
+
         return ret;
 }
 
@@ -457,11 +473,8 @@ server_inode (xlator_t *this)
         }
 
         ret = pthread_mutex_trylock (&conf->mutex);
-        if (ret) {
-                gf_log("", GF_LOG_WARNING, "Unable to dump itable"
-                       " errno: %d", errno);
-                return -1;
-        }
+        if (ret)
+                goto out;
 
         list_for_each_entry (trav, &conf->conns, list) {
                 if (trav->bound_xl && trav->bound_xl->itable) {
@@ -487,6 +500,11 @@ server_inode (xlator_t *this)
 
         ret = 0;
 out:
+        if (ret)
+                gf_proc_dump_write ("Unable to dump the inode table",
+                                    "(Lock acquisition failed) %s",
+                                    this?this->name:"server");
+
         return ret;
 }