Branch b1_6

b=13715
i=johann, nathan

Don't let out-dated timedout request invalidate the import.

diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index 3221c67..b7cff71 100644 (file)
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -806,7 +806,8 @@ finish:
  out:
         if (rc != 0) {
                 IMPORT_SET_STATE(imp, LUSTRE_IMP_DISCON);
-                if (aa->pcaa_initial_connect && !imp->imp_initial_recov)
+                if (aa->pcaa_initial_connect && !imp->imp_initial_recov &&
+                    (request->rq_import_generation == imp->imp_generation))
                         ptlrpc_deactivate_import(imp);
 
                 if (imp->imp_recon_bk && imp->imp_last_recon) {