Branch b1_6

b=14321
o=Brian Behlendorf(behlendorf1@llnl.gov)
i=bobijam
i=shadow

Description: lustre_mgs: operation 101 on unconnected MGS
Details    : When MGC is disconnected from MGS long enough, MGS will evict the
             MGC, and late on MGC cannot successfully connect to MGS and a lot
             of the error messages complaining that MGS is not connected.

lustre/ChangeLog

@@ -17,6 +17,13 @@ tbd  Sun Microsystems, Inc.
        * RHEL 4 and RHEL 5/SLES 10 clients behaves differently on 'cd' to a
         removed cwd "./" (refer to Bugzilla 14399).
 
+Severity   : normal
+Bugzilla   : 14321
+Description: lustre_mgs: operation 101 on unconnected MGS
+Details    : When MGC is disconnected from MGS long enough, MGS will evict the
+             MGC, and late on MGC cannot successfully connect to MGS and a lot
+	     of the error messages complaining that MGS is not connected.
+
 Severity   : enhancement
 Bugzilla   : 13397
 Description: Add server support for vanilla-2.6.22.14.

lustre/mgc/mgc_request.c

@@ -886,6 +886,8 @@ static int mgc_import_event(struct obd_device *obd,
         }
         case IMP_EVENT_ACTIVE: 
                 LCONSOLE_WARN("%s: Reactivating import\n", obd->obd_name);
+                /* Clearing obd_no_recov allows us to continue pinging */
+                obd->obd_no_recov = 0;
                 break;
         case IMP_EVENT_OCD:
                 break;