From d8a4cdbd1fc7b3ed8cbf90292179361ea67ffceb Mon Sep 17 00:00:00 2001 From: shadow Date: Thu, 23 Apr 2009 06:12:23 +0000 Subject: [PATCH] correctly skip time estimate if in recovery Branch b1_8 b=19223 i=johann i=nathan --- lustre/ChangeLog | 5 +++++ lustre/ptlrpc/client.c | 3 ++- lustre/tests/conf-sanity.sh | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index dd3d648..775d8b5 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -33,6 +33,11 @@ Bugzilla : 3055 Description: Enable adaptive timeouts by default Severity : normal +Bugzilla : 19223 +Descriptoin: correctly skip time estimate if in recovery +Details : rq_send_state insn't bitmask so using bitwise ops is forbid. + +Severity : normal Bugzilla : 18192 Descriptoin: fix goal inodes Details : Allocate inodes for llog in last inode group for avoid broke diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c index 337cf9b..bf061a6 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); diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 21f54849..00a2ba0 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -1771,6 +1771,7 @@ test_50e() { local pid CONN_PROC="osc.$FSNAME-OST0000-osc.ost_server_uuid" + reformat_and_config start_mds || return 1 #first client should see only one ost start_ost || return 2 -- 1.8.3.1