From 938a12769147505c7e42908df89733be19982205 Mon Sep 17 00:00:00 2001 From: Vladimir Saveliev Date: Sat, 28 Aug 2010 06:39:55 +0400 Subject: [PATCH] b=23588 conf-sanity.sh:test_50g - wait for new OST addition propagation to a client + fix for memory leak in osc_enqueue_base() i=nathan.rutman --- lustre/osc/osc_request.c | 4 +++- lustre/tests/conf-sanity.sh | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c index 76a046f..404bca2 100644 --- a/lustre/osc/osc_request.c +++ b/lustre/osc/osc_request.c @@ -3385,8 +3385,10 @@ int osc_enqueue_base(struct obd_export *exp, struct ldlm_res_id *res_id, RETURN(-ENOMEM); rc = ldlm_prep_enqueue_req(exp, req, &cancels, 0); - if (rc) + if (rc) { + ptlrpc_request_free(req); RETURN(rc); + } req_capsule_set_size(&req->rq_pill, &RMF_DLM_LVB, RCL_SERVER, sizeof *lvb); diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index ab75fb5..a6e690b 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -2098,6 +2098,8 @@ test_50g() { [ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2, skipping" && return setup start_ost2 || error "Unable to start OST2" + wait_osc_import_state mds ost2 FULL + wait_osc_import_state client ost2 FULL local PARAM="${FSNAME}-OST0001.osc.active" -- 1.8.3.1