protocol/server: Do connection cleanup if reply fails

We observed that after the first connection cleanup happens on
DISCONNECT the lock calls in transit are granted or added in
blocked locks queue. These locks were never cleaned up after that
because no unlock would come up on that connection. This would
leave references on that transport so it would never be destroyed.
Now, the connection cleanup happens whenever the reply
submission fails.

Also cleaned up the old code which is not used any more.

Change-Id: Ie4fe6f388ed18d9c907cf8ae06b0b7fd0601a660
BUG: 765430
Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Reviewed-on: http://review.gluster.com/809
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>

3 files changed, 14 insertions, 18 deletions

diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c
index 600d73cce..45f14dcb3 100644
--- a/xlators/protocol/server/src/server-helpers.c
+++ b/xlators/protocol/server/src/server-helpers.c
@@ -552,7 +552,6 @@ out:
 int
 server_connection_cleanup (xlator_t *this, server_connection_t *conn)
 {
-        char                do_cleanup = 0;
         struct _lock_table *ltable = NULL;
         fdentry_t          *fdentries = NULL;
         uint32_t            fd_count = 0;
@@ -563,24 +562,20 @@ server_connection_cleanup (xlator_t *this, server_connection_t *conn)
 
         pthread_mutex_lock (&conn->lock);
         {
-                conn->active_transports--;
-                if (conn->active_transports == 0) {
-                        if (conn->ltable) {
-                                ltable = conn->ltable;
-                                conn->ltable = gf_lock_table_new ();
-                        }
-
-                        if (conn->fdtable) {
-                                fdentries = gf_fd_fdtable_get_all_fds (conn->fdtable,
-                                                                       &fd_count);
-                        }
-                        do_cleanup = 1;
+                if (conn->ltable) {
+                        ltable = conn->ltable;
+                        conn->ltable = gf_lock_table_new ();
                 }
+
+                if (conn->fdtable)
+                        fdentries = gf_fd_fdtable_get_all_fds (conn->fdtable,
+                                                               &fd_count);
         }
         pthread_mutex_unlock (&conn->lock);
 
-        if (do_cleanup && conn->bound_xl)
-                ret = do_connection_cleanup (this, conn, ltable, fdentries, fd_count);
+        if (conn->bound_xl)
+                ret = do_connection_cleanup (this, conn, ltable,
+                                             fdentries, fd_count);
 
 out:
         return ret;
@@ -814,7 +809,6 @@ server_connection_get (xlator_t *this, const char *id)
                 list_add (&conn->list, &conf->conns);
 
                 conn->ref++;
-                conn->active_transports++;
         }
 unlock:
         pthread_mutex_unlock (&conf->mutex);
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c
index e9f281820..d767199d0 100644
--- a/xlators/protocol/server/src/server.c
+++ b/xlators/protocol/server/src/server.c
@@ -98,12 +98,14 @@ server_submit_reply (call_frame_t *frame, rpcsvc_request_t *req, void *arg,
         struct iovec            rsp        = {0,};
         server_state_t         *state      = NULL;
         char                    new_iobref = 0;
+        server_connection_t    *conn  = NULL;
 
         GF_VALIDATE_OR_GOTO ("server", req, ret);
 
         if (frame) {
                 state = CALL_STATE (frame);
                 frame->local = NULL;
+                conn  = SERVER_CONNECTION(frame);
         }
 
         if (!iobref) {
@@ -138,6 +140,8 @@ server_submit_reply (call_frame_t *frame, rpcsvc_request_t *req, void *arg,
         iobuf_unref (iob);
         if (ret == -1) {
                 gf_log_callingfn ("", GF_LOG_ERROR, "Reply submission failed");
+                if (frame && conn)
+                        server_connection_cleanup (frame->this, conn);
                 goto ret;
         }
 
diff --git a/xlators/protocol/server/src/server.h b/xlators/protocol/server/src/server.h
index 17de0e8d5..c8fd5f271 100644
--- a/xlators/protocol/server/src/server.h
+++ b/xlators/protocol/server/src/server.h
@@ -57,9 +57,7 @@ struct _server_connection {
         struct list_head    list;
         char               *id;
         int                 ref;
-        int                 active_transports;
         pthread_mutex_t     lock;
-        char                disconnected;
         fdtable_t          *fdtable;
         struct _lock_table *ltable;
         xlator_t           *bound_xl;