From 0139fdbf43662ece88853bbd5e66e535e07f1ae7 Mon Sep 17 00:00:00 2001 From: yury Date: Wed, 21 Jan 2009 16:42:12 +0000 Subject: [PATCH] b=17310 r=johann - temporary fix for assert caused by long connect interpret in umount time. --- lustre/ptlrpc/import.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c index 85214eb..a5168d3 100644 --- a/lustre/ptlrpc/import.c +++ b/lustre/ptlrpc/import.c @@ -311,6 +311,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 @@ -323,6 +333,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 " -- 1.8.3.1