From 44a1857e544f64e10e8bfb4641bedd841910a6c6 Mon Sep 17 00:00:00 2001 From: Kaushal M Date: Fri, 4 May 2012 15:13:03 +0530 Subject: protocol/{client,server} : Log improvements Make use of gfid in log messages. Change-Id: I28548be64d19418f99ee9ccdbd3ac4ae67c6c015 BUG: 814666 Signed-off-by: Kaushal M Reviewed-on: http://review.gluster.com/3274 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/protocol/client/src/client3_1-fops.c | 54 ++++++++++++++++++---------- xlators/protocol/server/src/server3_1-fops.c | 10 +++--- 2 files changed, 42 insertions(+), 22 deletions(-) (limited to 'xlators/protocol') diff --git a/xlators/protocol/client/src/client3_1-fops.c b/xlators/protocol/client/src/client3_1-fops.c index 3289da369..13b577a57 100644 --- a/xlators/protocol/client/src/client3_1-fops.c +++ b/xlators/protocol/client/src/client3_1-fops.c @@ -189,9 +189,11 @@ client3_1_symlink_cbk (struct rpc_req *req, struct iovec *iov, int count, out: if (rsp.op_ret == -1) { gf_log (this->name, GF_LOG_WARNING, - "remote operation failed: %s. Path: %s", + "remote operation failed: %s. Path: %s (%s)", strerror (gf_error_to_errno (rsp.op_errno)), - (local) ? local->loc.path : "--"); + (local) ? local->loc.path : "--", + (local && local->loc.inode) ? + uuid_utoa (local->loc.inode->gfid) : "--"); } CLIENT_STACK_UNWIND (symlink, frame, rsp.op_ret, @@ -258,9 +260,11 @@ client3_1_mknod_cbk (struct rpc_req *req, struct iovec *iov, int count, out: if (rsp.op_ret == -1) { gf_log (this->name, GF_LOG_WARNING, - "remote operation failed: %s. Path: %s", + "remote operation failed: %s. Path: %s (%s)", strerror (gf_error_to_errno (rsp.op_errno)), - (local) ? local->loc.path : "--"); + (local) ? local->loc.path : "--", + (local && local->loc.inode) ? + uuid_utoa (local->loc.inode->gfid) : "--"); } CLIENT_STACK_UNWIND (mknod, frame, rsp.op_ret, @@ -325,9 +329,11 @@ client3_1_mkdir_cbk (struct rpc_req *req, struct iovec *iov, int count, out: if (rsp.op_ret == -1) { gf_log (this->name, GF_LOG_WARNING, - "remote operation failed: %s. Path: %s", + "remote operation failed: %s. Path: %s (%s)", strerror (gf_error_to_errno (rsp.op_errno)), - (local) ? local->loc.path : "--"); + (local) ? local->loc.path : "--", + (local && local->loc.inode) ? + uuid_utoa (local->loc.inode->gfid) : "--"); } CLIENT_STACK_UNWIND (mkdir, frame, rsp.op_ret, @@ -414,9 +420,11 @@ client3_1_open_cbk (struct rpc_req *req, struct iovec *iov, int count, out: if (rsp.op_ret == -1) { gf_log (this->name, GF_LOG_WARNING, - "remote operation failed: %s. Path: %s", + "remote operation failed: %s. Path: %s (%s)", strerror (gf_error_to_errno (rsp.op_errno)), - (local) ? local->loc.path : "--"); + (local) ? local->loc.path : "--", + (local && local->loc.inode) ? + uuid_utoa (local->loc.inode->gfid) : "--"); } CLIENT_STACK_UNWIND (open, frame, rsp.op_ret, @@ -1052,9 +1060,11 @@ out: if (rsp.op_ret == -1) { gf_log (this->name, ((op_errno == ENOTSUP) ? GF_LOG_DEBUG : GF_LOG_WARNING), - "remote operation failed: %s. Path: %s", + "remote operation failed: %s. Path: %s (%s)", strerror (op_errno), - (local) ? local->loc.path : "--"); + (local) ? local->loc.path : "--", + (local && local->loc.inode) ? + uuid_utoa (local->loc.inode->gfid) : "--"); } CLIENT_STACK_UNWIND (getxattr, frame, rsp.op_ret, op_errno, dict, xdata); @@ -1703,9 +1713,11 @@ client3_1_xattrop_cbk (struct rpc_req *req, struct iovec *iov, int count, out: if (rsp.op_ret == -1) { gf_log (this->name, GF_LOG_WARNING, - "remote operation failed: %s. Path: %s", + "remote operation failed: %s. Path: %s (%s)", strerror (gf_error_to_errno (rsp.op_errno)), - (local) ? local->loc.path : "--"); + (local) ? local->loc.path : "--", + (local && local->loc.inode) ? + uuid_utoa (local->loc.inode->gfid) : "--"); } CLIENT_STACK_UNWIND (xattrop, frame, rsp.op_ret, @@ -2041,9 +2053,11 @@ client3_1_create_cbk (struct rpc_req *req, struct iovec *iov, int count, out: if (rsp.op_ret == -1) { gf_log (this->name, GF_LOG_WARNING, - "remote operation failed: %s. Path: %s", + "remote operation failed: %s. Path: %s (%s)", strerror (gf_error_to_errno (rsp.op_errno)), - (local) ? local->loc.path : "--"); + (local) ? local->loc.path : "--", + (local && local->loc.inode) ? + uuid_utoa (local->loc.inode->gfid) : "--"); } CLIENT_STACK_UNWIND (create, frame, rsp.op_ret, @@ -2533,9 +2547,11 @@ client3_1_opendir_cbk (struct rpc_req *req, struct iovec *iov, int count, out: if (rsp.op_ret == -1) { gf_log (this->name, GF_LOG_WARNING, - "remote operation failed: %s. Path: %s", + "remote operation failed: %s. Path: %s (%s)", strerror (gf_error_to_errno (rsp.op_errno)), - (local) ? local->loc.path : "--"); + (local) ? local->loc.path : "--", + (local && local->loc.inode) ? + uuid_utoa (local->loc.inode->gfid) : "--"); } CLIENT_STACK_UNWIND (opendir, frame, rsp.op_ret, gf_error_to_errno (rsp.op_errno), fd, xdata); @@ -2615,9 +2631,11 @@ out: /* any error other than ENOENT */ if (rsp.op_errno != ENOENT) gf_log (this->name, GF_LOG_WARNING, - "remote operation failed: %s. Path: %s", + "remote operation failed: %s. Path: %s (%s)", strerror (rsp.op_errno), - (local) ? local->loc.path : "--"); + (local) ? local->loc.path : "--", + (local && local->loc.inode) ? + uuid_utoa (local->loc.inode->gfid) : "--"); else gf_log (this->name, GF_LOG_TRACE, "not found on remote node"); diff --git a/xlators/protocol/server/src/server3_1-fops.c b/xlators/protocol/server/src/server3_1-fops.c index 10dddd79b..c652dd5b3 100644 --- a/xlators/protocol/server/src/server3_1-fops.c +++ b/xlators/protocol/server/src/server3_1-fops.c @@ -523,9 +523,10 @@ server_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, inode_unref (link_inode); } else { gf_log (this->name, GF_LOG_INFO, - "%"PRId64": MKDIR %s ==> %"PRId32" (%s)", + "%"PRId64": MKDIR %s (%s) ==> %"PRId32" (%s)", frame->root->unique, state->loc.path, - op_ret, strerror (op_errno)); + state->loc.inode ? uuid_utoa (state->loc.inode->gfid) : + "--",op_ret, strerror (op_errno)); } GF_PROTOCOL_DICT_SERIALIZE (this, xdata, (&rsp.xdata.xdata_val), @@ -569,9 +570,10 @@ server_mknod_cbk (call_frame_t *frame, void *cookie, xlator_t *this, inode_unref (link_inode); } else { gf_log (this->name, GF_LOG_INFO, - "%"PRId64": MKNOD %s ==> %"PRId32" (%s)", + "%"PRId64": MKNOD %s (%s) ==> %"PRId32" (%s)", frame->root->unique, state->loc.path, - op_ret, strerror (op_errno)); + state->loc.inode ? uuid_utoa (state->loc.inode->gfid) : + "--",op_ret, strerror (op_errno)); } GF_PROTOCOL_DICT_SERIALIZE (this, xdata, (&rsp.xdata.xdata_val), -- cgit