b=17310

r=johann

- tmp fix for long connect rpc interpret causing the assert

diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index 3b22441..70576f2 100644 (file)
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -318,6 +318,16 @@ void ptlrpc_invalidate_import(struct obd_import *imp)
                         }
 
                         if (atomic_read(&imp->imp_unregistering) == 0) {
+                                /* XXX: This is temporary workaround for long 
+                                 * connect interpret due to locking in lov in 
+                                 * in import activation path, which causes
+                                 * connect rpc stay on sending list longer
+                                 * time. Let's wait longer insread of asserting
+                                 * here.
+                                 *
+                                 * Activation should not be blocking. Kill
+                                 * this #if 0 when activation code is fixed. */
+#if 0
                                 /* We know that only "unregistering" rpcs may
                                  * still survive in sending or delaying lists
                                  * (They are waiting for long reply unlink in
@@ -330,6 +340,7 @@ void ptlrpc_invalidate_import(struct obd_import *imp)
                                  * dropped to zero. No new inflights possible at
                                  * this point. */
                                 rc = 0;
+#endif
                         } else {
                                 CERROR("%s: RPCs in \"%s\" phase found (%d). "
                                        "Network is sluggish? Waiting them "