From a4f509964acf3eff857a32186afc23745054beb4 Mon Sep 17 00:00:00 2001 From: Sakshi Date: Fri, 12 Jun 2015 19:42:30 +0530 Subject: dht: remove 'null' for directory/file path from brick log for many operations Backport of http://review.gluster.org/#/c/11206/ > Change-Id: I39cd2089240c0ad62b749f176847cc5337e57f73 > BUG: 1231264 > Signed-off-by: Sakshi > Reviewed-on: http://review.gluster.org/11206 > Tested-by: NetBSD Build System > Reviewed-by: Shyamsundar Ranganathan > Reviewed-by: Raghavendra G BUG: 1308415 Change-Id: I161844d3b419a8b5fb0300969e54f2ac9182534d Signed-off-by: Sakshi Reviewed-on: http://review.gluster.org/13445 Smoke: Gluster Build System CentOS-regression: Gluster Build System Reviewed-by: N Balachandran NetBSD-regression: NetBSD Build System Reviewed-by: Raghavendra G --- xlators/protocol/server/src/server-rpc-fops.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'xlators/protocol') diff --git a/xlators/protocol/server/src/server-rpc-fops.c b/xlators/protocol/server/src/server-rpc-fops.c index e50284a06eb..77d8a51a082 100644 --- a/xlators/protocol/server/src/server-rpc-fops.c +++ b/xlators/protocol/server/src/server-rpc-fops.c @@ -454,7 +454,8 @@ server_rmdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, gf_msg (this->name, GF_LOG_INFO, op_errno, PS_MSG_DIR_INFO, "%"PRId64": RMDIR %s (%s/%s) ==> (%s)", - frame->root->unique, state->loc.path, + frame->root->unique, + (state->loc.path) ? state->loc.path : "", uuid_utoa (state->resolve.pargfid), state->resolve.bname, strerror (op_errno)); goto out; @@ -504,7 +505,8 @@ server_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, gf_msg (this->name, fop_log_level (GF_FOP_MKDIR, op_errno), op_errno, PS_MSG_DIR_INFO, "%"PRId64": MKDIR %s (%s/%s) ==> (%s)", - frame->root->unique, state->loc.path, + frame->root->unique, + (state->loc.path) ? state->loc.path : "", uuid_utoa (state->resolve.pargfid), state->resolve.bname, strerror (op_errno)); goto out; @@ -682,7 +684,8 @@ server_opendir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, gf_msg (this->name, fop_log_level (GF_FOP_OPENDIR, op_errno), op_errno, PS_MSG_DIR_INFO, "%"PRId64": OPENDIR %s (%s) ==> (%s)", - frame->root->unique, state->loc.path, + frame->root->unique, + (state->loc.path) ? state->loc.path : "", uuid_utoa (state->resolve.gfid), strerror (op_errno)); goto out; } -- cgit