Branch b1_6

b=12696
i=johann
i=adilger

Severity   : normal
Frequency  : rare
Bugzilla   : 12696
Description: ASSERTION(imp->imp_conn_current) failed
Details    : an assertion failure is hit if a client node boots and attempts to
            mount a lustre filesystem faster than RECONNECT_INTERVAL seconds.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 433e4b7..19cb2e6 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -15,6 +15,13 @@ tbd         Cluster File Systems, Inc. <info@clusterfs.com>
        * bug fixes
 
 Severity   : normal
+Frequency  : rare
+Bugzilla   : 12696
+Description: ASSERTION(imp->imp_conn_current) failed
+Details    : an assertion failure is hit if a client node boots and attempts to
+            mount a lustre filesystem faster than RECONNECT_INTERVAL seconds.
+
+Severity   : normal
 Frequency  : only for i686
 Bugzilla   : 12695
 Description: 1.4.11 RC1 build fails for RHEL 4, i686

diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index 089ade3..afb3b09 100644 (file)
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -288,6 +288,14 @@ static int import_select_connection(struct obd_import *imp)
                         else if (cfs_time_before_64(conn->oic_last_attempt,
                                                     imp_conn->oic_last_attempt))
                                 imp_conn = conn;
+                } else {
+                        /* Exceptionally unlikely case caused by the node
+                         * booting and attempting to mount lustre faster than
+                         * than RECONNECT_INTERVAL seconds. */
+                        if (unlikely(conn->oic_last_attempt == 0)) {
+                                imp_conn = conn;
+                                break;
+                        }
                 }
         }