From f9948966b62e66114b35563233357be72ad794d0 Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Wed, 7 May 2008 22:23:22 +0000
Subject: [PATCH] Branch b_release_1_6_5 Update client side RPC messages to
match those on the server, as changed previously on the server in bug 13537,
allowing the same :pid:xid: string to be searched in both client and server
logs. b=13537
---
lustre/ptlrpc/client.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index bca2b1b93c..c763faa1e2 100644
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -938,7 +938,7 @@ static int ptlrpc_send_new_req(struct ptlrpc_request *req)
lustre_msg_set_status(req->rq_reqmsg, cfs_curproc_pid());
CDEBUG(D_RPCTRACE, "Sending RPC pname:cluuid:pid:xid:nid:opc"
- " %s:%s:%d:"LPU64":%s:%d\n", cfs_curproc_comm(),
+ " %s:%s:%d:x"LPU64":%s:%d\n", cfs_curproc_comm(),
imp->imp_obd->obd_uuid.uuid,
lustre_msg_get_status(req->rq_reqmsg), req->rq_xid,
libcfs_nid2str(imp->imp_connection->c_peer.nid),
@@ -1170,7 +1170,7 @@ int ptlrpc_check_set(struct ptlrpc_request_set *set)
req->rq_phase = RQ_PHASE_COMPLETE;
CDEBUG(D_RPCTRACE, "Completed RPC pname:cluuid:pid:xid:nid:"
- "opc %s:%s:%d:"LPU64":%s:%d\n", cfs_curproc_comm(),
+ "opc %s:%s:%d:x"LPU64":%s:%d\n", cfs_curproc_comm(),
imp->imp_obd->obd_uuid.uuid,
lustre_msg_get_status(req->rq_reqmsg), req->rq_xid,
libcfs_nid2str(imp->imp_connection->c_peer.nid),
@@ -1777,7 +1777,7 @@ int ptlrpc_queue_wait(struct ptlrpc_request *req)
lustre_msg_set_status(req->rq_reqmsg, cfs_curproc_pid());
LASSERT(imp->imp_obd != NULL);
CDEBUG(D_RPCTRACE, "Sending RPC pname:cluuid:pid:xid:nid:opc "
- "%s:%s:%d:"LPU64":%s:%d\n", cfs_curproc_comm(),
+ "%s:%s:%d:x"LPU64":%s:%d\n", cfs_curproc_comm(),
imp->imp_obd->obd_uuid.uuid,
lustre_msg_get_status(req->rq_reqmsg), req->rq_xid,
libcfs_nid2str(imp->imp_connection->c_peer.nid),
@@ -1884,7 +1884,7 @@ restart:
}
CDEBUG(D_RPCTRACE, "Completed RPC pname:cluuid:pid:xid:nid:opc "
- "%s:%s:%d:"LPU64":%s:%d\n", cfs_curproc_comm(),
+ "%s:%s:%d:x"LPU64":%s:%d\n", cfs_curproc_comm(),
imp->imp_obd->obd_uuid.uuid,
lustre_msg_get_status(req->rq_reqmsg), req->rq_xid,
libcfs_nid2str(imp->imp_connection->c_peer.nid),
--
GitLab