- Add some more verbose logging of the cases that get clients into recovery.

[fs/lustre-release.git] / lustre / ptlrpc / connection.c

diff --git a/lustre/ptlrpc/connection.c b/lustre/ptlrpc/connection.c
index 10cd9ca..07b46eb 100644 (file)
--- a/lustre/ptlrpc/connection.c
+++ b/lustre/ptlrpc/connection.c
@@ -22,22 +22,40 @@
 
 #define DEBUG_SUBSYSTEM S_RPC
 
+#include <linux/obd_support.h>
 #include <linux/lustre_net.h>
 
 static spinlock_t conn_lock;
 static struct list_head conn_list;
 static struct list_head conn_unused_list;
 
-struct ptlrpc_connection *ptlrpc_get_connection(struct lustre_peer *peer)
+/* If UUID is NULL, c->c_remote_uuid must be all zeroes
+ * If UUID is non-NULL, c->c_remote_uuid must match. */
+static int match_connection_uuid(struct ptlrpc_connection *c, obd_uuid_t uuid)
+{
+        obd_uuid_t zero_uuid = {0};
+
+        if (uuid)
+                return memcmp(c->c_remote_uuid, uuid, sizeof(uuid));
+
+        return memcmp(c->c_remote_uuid, zero_uuid, sizeof(zero_uuid));
+}
+
+struct ptlrpc_connection *ptlrpc_get_connection(struct lustre_peer *peer,
+                                                obd_uuid_t uuid)
 {
         struct list_head *tmp, *pos;
         struct ptlrpc_connection *c;
         ENTRY;
 
+        CDEBUG(D_INFO, "peer is %08x %08lx %08lx\n",
+               peer->peer_nid, peer->peer_ni.nal_idx, peer->peer_ni.handle_idx);
+
         spin_lock(&conn_lock);
         list_for_each(tmp, &conn_list) {
                 c = list_entry(tmp, struct ptlrpc_connection, c_link);
-                if (memcmp(peer, &c->c_peer, sizeof(*peer)) == 0) {
+                if (memcmp(peer, &c->c_peer, sizeof(*peer)) == 0 &&
+                    !match_connection_uuid(c, uuid)) {
                         ptlrpc_connection_addref(c);
                         GOTO(out, c);
                 }
@@ -45,7 +63,8 @@ struct ptlrpc_connection *ptlrpc_get_connection(struct lustre_peer *peer)
 
         list_for_each_safe(tmp, pos, &conn_unused_list) {
                 c = list_entry(tmp, struct ptlrpc_connection, c_link);
-                if (memcmp(peer, &c->c_peer, sizeof(*peer)) == 0) {
+                if (memcmp(peer, &c->c_peer, sizeof(*peer)) == 0 &&
+                    !match_connection_uuid(c, uuid)) {
                         ptlrpc_connection_addref(c);
                         list_del(&c->c_link);
                         list_add(&c->c_link, &conn_list);
@@ -65,6 +84,14 @@ struct ptlrpc_connection *ptlrpc_get_connection(struct lustre_peer *peer)
         c->c_generation = 1;
         c->c_epoch = 1;
         c->c_bootcount = 0;
+        if (uuid)
+                strcpy(c->c_remote_uuid, uuid);
+        INIT_LIST_HEAD(&c->c_delayed_head);
+        INIT_LIST_HEAD(&c->c_sending_head);
+        INIT_LIST_HEAD(&c->c_dying_head);
+        INIT_LIST_HEAD(&c->c_imports);
+        INIT_LIST_HEAD(&c->c_exports);
+        INIT_LIST_HEAD(&c->c_sb_chain);
         atomic_set(&c->c_refcount, 0);
         ptlrpc_connection_addref(c);
         spin_lock_init(&c->c_lock);
@@ -83,7 +110,13 @@ int ptlrpc_put_connection(struct ptlrpc_connection *c)
         int rc = 0;
         ENTRY;
 
-        CDEBUG(D_INFO, "connection=%p\n", c);
+        if (c == NULL) {
+                CERROR("NULL connection\n");
+                RETURN(0);
+        }
+
+        CDEBUG(D_INFO, "connection=%p refcount %d\n",
+               c, atomic_read(&c->c_refcount) - 1);
         if (atomic_dec_and_test(&c->c_refcount)) {
                 spin_lock(&conn_lock);
                 list_del(&c->c_link);
@@ -92,7 +125,8 @@ int ptlrpc_put_connection(struct ptlrpc_connection *c)
                 rc = 1;
         }
         if (atomic_read(&c->c_refcount) < 0)
-                CDEBUG(D_INFO, "refcount < 0 for connection %p!\n", c);
+                CERROR("connection %p refcount %d!\n",
+                       c, atomic_read(&c->c_refcount));
 
         RETURN(rc);
 }
@@ -100,7 +134,8 @@ int ptlrpc_put_connection(struct ptlrpc_connection *c)
 struct ptlrpc_connection *ptlrpc_connection_addref(struct ptlrpc_connection *c)
 {
         ENTRY;
-        CDEBUG(D_INFO, "connection=%p\n", c);
+        CDEBUG(D_INFO, "connection=%p refcount %d\n",
+               c, atomic_read(&c->c_refcount) + 1);
         atomic_inc(&c->c_refcount);
         RETURN(c);
 }