From 7967d61fc945cdc05ff9078baeb6fc02ef186ccf Mon Sep 17 00:00:00 2001 From: johann Date: Wed, 22 Apr 2009 21:06:35 +0000 Subject: [PATCH] Branch b_release_1_8_0 b=19223 i=johann (patch from shadow) i=nathan correctly skip time estimate if in recovery --- lustre/ChangeLog | 7 ++++++- lustre/ptlrpc/client.c | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 47368c8..c88e68f 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -838,10 +838,15 @@ Details : Do not put cancelled locks into replay list, hold references on Severity : critical Bugzilla : 18695 -Descriptoin: Lustre detected file system corruption with inode out of bounds +Description: Lustre detected file system corruption with inode out of bounds Details : don't update i_size on MDS_CLOSE for directories. This causes directory corruptions on the MDT. +Severity : normal +Bugzilla : 19223 +Description: client doesn't try to reconnect +Details : correctly skip time estimate if in recovery + ------------------------------------------------------------------------------- 2008-05-26 Sun Microsystems, Inc. diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c index 6310b26..c0abafd 100644 --- a/lustre/ptlrpc/client.c +++ b/lustre/ptlrpc/client.c @@ -226,7 +226,8 @@ static void ptlrpc_at_adj_service(struct ptlrpc_request *req, struct imp_at *at; /* do estimate only if is not in recovery */ - if (!(req->rq_send_state & (LUSTRE_IMP_FULL | LUSTRE_IMP_CONNECTING))) + if ((req->rq_send_state != LUSTRE_IMP_FULL) && + (req->rq_send_state != LUSTRE_IMP_CONNECTING)) return; LASSERT(req->rq_import); -- 1.8.3.1