From 8cfa7f80d3975298d5738091da7d9c28d6f5c9f5 Mon Sep 17 00:00:00 2001 From: Isaac Huang Date: Wed, 7 Jan 2015 15:05:39 -0700 Subject: [PATCH] LU-4181 lnet_selftest: bogus lst errors It should not be counted as errors if a test RPC has been stopped due to administrative actions, e.g. lst end_session from the remote test console. Change-Id: Ia35f5e357ce6bf7ad57efb3652ebb27c772ac611 Signed-off-by: Isaac Huang Reviewed-on: http://review.whamcloud.com/13279 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Amir Shehata Reviewed-by: Liang Zhen Reviewed-by: Oleg Drokin --- lnet/selftest/rpc.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/lnet/selftest/rpc.c b/lnet/selftest/rpc.c index 4119bde..2845bf6 100644 --- a/lnet/selftest/rpc.c +++ b/lnet/selftest/rpc.c @@ -1458,17 +1458,16 @@ srpc_lnet_ev_handler(lnet_event_t *ev) LASSERT (!in_interrupt()); if (ev->status != 0) { + __u32 errors; + spin_lock(&srpc_data.rpc_glock); - srpc_data.rpc_counters.errors++; - CERROR("ev->status = %d, ev->type = %d, errors = %u, " - "rpcs_sent = %u, rpcs_rcvd = %u, rpcs_dropped = %u, " - "rpcs_expired = %u\n", - ev->status, ev->type, srpc_data.rpc_counters.errors, - srpc_data.rpc_counters.rpcs_sent, - srpc_data.rpc_counters.rpcs_rcvd, - srpc_data.rpc_counters.rpcs_dropped, - srpc_data.rpc_counters.rpcs_expired); + if (ev->status != -ECANCELED) /* cancellation is not error */ + srpc_data.rpc_counters.errors++; + errors = srpc_data.rpc_counters.errors; spin_unlock(&srpc_data.rpc_glock); + + CNETERR("LNet event status %d type %d, RPC errors %u\n", + ev->status, ev->type, errors); } rpcev->ev_lnet = ev->type; -- 1.8.3.1