From e2b6127b3dc635aa69ff42273d15142d4e04ac21 Mon Sep 17 00:00:00 2001 From: tappro Date: Wed, 10 Sep 2008 05:09:40 +0000 Subject: [PATCH] - reset imp_vbr_failed flag properly b:16987 i:bzzz, rread --- lustre/ptlrpc/import.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c index 882f5c5..00addf9 100644 --- a/lustre/ptlrpc/import.c +++ b/lustre/ptlrpc/import.c @@ -1022,15 +1022,19 @@ static int completed_replay_interpret(struct ptlrpc_request *req, !req->rq_import->imp_vbr_failed) { ptlrpc_import_recovery_state_machine(req->rq_import); } else { - if (req->rq_import->imp_vbr_failed) + if (req->rq_import->imp_vbr_failed) { CDEBUG(D_WARNING, "%s: version recovery fails, reconnecting\n", req->rq_import->imp_obd->obd_name); - else + spin_lock(&req->rq_import->imp_lock); + req->rq_import->imp_vbr_failed = 0; + spin_unlock(&req->rq_import->imp_lock); + } else { CDEBUG(D_HA, "%s: LAST_REPLAY message error: %d, " "reconnecting\n", req->rq_import->imp_obd->obd_name, req->rq_status); + } ptlrpc_connect_import(req->rq_import, NULL); } RETURN(0); -- 1.8.3.1