From f4c8cde0bc7dd683a1746e6aaf3f9f29443a9229 Mon Sep 17 00:00:00 2001 From: bobijam Date: Thu, 20 Dec 2007 02:17:54 +0000 Subject: [PATCH] Branch HEAD b=13715 i=nathan i=johann * Activate import on intial connection. * Don't let outdated timeout request invalidate import. --- lustre/ptlrpc/import.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c index 737a86a..a854214 100644 --- a/lustre/ptlrpc/import.c +++ b/lustre/ptlrpc/import.c @@ -596,6 +596,7 @@ static int ptlrpc_connect_interpret(struct ptlrpc_request *request, *lustre_msg_get_handle(request->rq_repmsg); IMPORT_SET_STATE(imp, LUSTRE_IMP_FULL); + ptlrpc_activate_import(imp); GOTO(finish, rc = 0); } else { spin_unlock(&imp->imp_lock); @@ -786,7 +787,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) || -- 1.8.3.1