From 3912ebcd3faedb3557a945ede8b7357632eeb3e2 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 17 Aug 2005 08:30:52 +0000 Subject: [PATCH] b=7268 - additional debug info --- lustre/ost/ost_handler.c | 13 +++++++++++-- lustre/ptlrpc/service.c | 3 ++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c index 19cf54a..a945bda 100644 --- a/lustre/ost/ost_handler.c +++ b/lustre/ost/ost_handler.c @@ -512,15 +512,24 @@ static int ost_brw_read(struct ptlrpc_request *req) if (rc == 0) { rc = ptlrpc_start_bulk_transfer(desc); if (rc == 0) { + struct timeval tstart, now; + do_gettimeofday(&tstart); lwi = LWI_TIMEOUT(obd_timeout * HZ / 4, ost_bulk_timeout, desc); rc = l_wait_event(desc->bd_waitq, !ptlrpc_bulk_active(desc), &lwi); LASSERT(rc == 0 || rc == -ETIMEDOUT); + do_gettimeofday(&now); if (rc == -ETIMEDOUT) { DEBUG_REQ(D_ERROR, req, "timeout on bulk PUT" - ", expt_conn_cnt = %u", - req->rq_export->exp_conn_cnt); + ", expt_conn_cnt = %u, real wait %us" + ", arrived %u.%u, served %u.%u", + req->rq_export->exp_conn_cnt, + (unsigned) (now.tv_sec - tstart.tv_sec), + (unsigned) req->rq_arrival_time.tv_sec, + (unsigned) req->rq_arrival_time.tv_usec, + (unsigned) req->rq_rpcd_start.tv_sec, + (unsigned) req->rq_rpcd_start.tv_usec); ptlrpc_abort_bulk(desc); } else if (!desc->bd_success || desc->bd_nob_transferred != desc->bd_nob) { diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c index c7d4ca9..0bfa65f 100644 --- a/lustre/ptlrpc/service.c +++ b/lustre/ptlrpc/service.c @@ -536,7 +536,8 @@ ptlrpc_server_handle_request (struct ptlrpc_service *svc) request->rq_peer.peer_ni->pni_name, request->rq_peerstr, request->rq_reqmsg->opc); - + + do_gettimeofday(&request->rq_rpcd_start); request->rq_svc = svc; rc = svc->srv_handler(request); request->rq_svc = NULL; -- 1.8.3.1