From: nathan <nathan>
Date: Fri, 3 Feb 2006 19:08:47 +0000 (+0000)
Subject: Branch b1_4_mountconf
X-Git-Tag: v1_8_0_110~486^4~57
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=6b252cf4a6a9ae0f4fbde2b042211a839c81664c;p=fs%2Flustre-release.git

Branch b1_4_mountconf
b=9851
reactivate MGS import if we're trying to reconnect to the import after
it has previously failed, and we want to try another "one shot" connection.
---

diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c
index ccc5228..a491614 100644
--- a/lustre/mgc/mgc_request.c
+++ b/lustre/mgc/mgc_request.c
@@ -648,6 +648,12 @@ int mgc_set_info(struct obd_export *exp, obd_count keylen,
                 imp->imp_initial_recov_bk = *(int *)val;
                 CDEBUG(D_HA, "%s: set imp_initial_recov_bk = %d\n",
                        exp->exp_obd->obd_name, imp->imp_initial_recov_bk);
+                if (imp->imp_invalid) {
+                        /* Resurrect if we previously died */
+                        CDEBUG(D_MGC, "Reactivate %s\n", 
+                               imp->imp_obd->obd_name);
+                        ptlrpc_activate_import(imp);
+                }
                 RETURN(0);
         }
         /* Hack alert */