From 6afe7fb246ece2ee2c10d98fdbd4d331ef43a56b Mon Sep 17 00:00:00 2001 From: Ashish Pandey Date: Wed, 20 Jan 2016 14:30:08 +0530 Subject: cluster/ec: Use correct log levels Problem : Misleading messages are getting logged in mount logs and bricks log. "Mismatching xdata" and "Heal failed" are getting logged Solution : Reduce the level of logs from INFO, WARNING and NOTICE to DEBUG level wherever applicable OR use fop_log_level to get proper log level. Backport of commit 02b2750ecc35f88c3262015b401dda962381f9da: > Change-Id: Ia824c71e75ab683d3cb8949e1966ea09c9ccce72 > BUG: 1231224 > Signed-off-by: Ashish Pandey > Reviewed-on: http://review.gluster.org/13266 > Smoke: Gluster Build System > Reviewed-by: Xavier Hernandez > NetBSD-regression: NetBSD Build System > CentOS-regression: Gluster Build System > Reviewed-by: Pranith Kumar Karampuri Change-Id: Ia824c71e75ab683d3cb8949e1966ea09c9ccce72 BUG: 1254934 Signed-off-by: Ashish Pandey Reviewed-on: http://review.gluster.org/14520 NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Smoke: Gluster Build System Reviewed-by: Pranith Kumar Karampuri Reviewed-by: Niels de Vos --- xlators/cluster/ec/src/ec-combine.c | 2 +- xlators/cluster/ec/src/ec-generic.c | 2 +- xlators/protocol/client/src/client-rpc-fops.c | 2 +- xlators/protocol/server/src/server-rpc-fops.c | 4 ++-- xlators/storage/posix/src/posix.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xlators/cluster/ec/src/ec-combine.c b/xlators/cluster/ec/src/ec-combine.c index 4afbc5bb2b..2566cc0d0c 100644 --- a/xlators/cluster/ec/src/ec-combine.c +++ b/xlators/cluster/ec/src/ec-combine.c @@ -860,7 +860,7 @@ int32_t ec_combine_check(ec_cbk_data_t * dst, ec_cbk_data_t * src, if (!ec_dict_compare(dst->xdata, src->xdata)) { - gf_msg (fop->xl->name, GF_LOG_WARNING, 0, + gf_msg (fop->xl->name, GF_LOG_DEBUG, 0, EC_MSG_XDATA_MISMATCH, "Mismatching xdata in answers " "of '%s'", ec_fop_name(fop->id)); diff --git a/xlators/cluster/ec/src/ec-generic.c b/xlators/cluster/ec/src/ec-generic.c index 375e49e695..0ad514908a 100644 --- a/xlators/cluster/ec/src/ec-generic.c +++ b/xlators/cluster/ec/src/ec-generic.c @@ -1125,7 +1125,7 @@ int32_t ec_combine_xattrop(ec_fop_data_t *fop, ec_cbk_data_t *dst, { if (!ec_dict_compare(dst->dict, src->dict)) { - gf_msg (fop->xl->name, GF_LOG_NOTICE, 0, + gf_msg (fop->xl->name, GF_LOG_DEBUG, 0, EC_MSG_DICT_MISMATCH, "Mismatching dictionary in " "answers of 'GF_FOP_XATTROP'"); diff --git a/xlators/protocol/client/src/client-rpc-fops.c b/xlators/protocol/client/src/client-rpc-fops.c index 872f7635b1..d35d0e0486 100644 --- a/xlators/protocol/client/src/client-rpc-fops.c +++ b/xlators/protocol/client/src/client-rpc-fops.c @@ -1758,7 +1758,7 @@ client3_3_xattrop_cbk (struct rpc_req *req, struct iovec *iov, int count, } out: if (rsp.op_ret == -1) { - gf_msg (this->name, GF_LOG_WARNING, + gf_msg (this->name, fop_log_level (GF_FOP_XATTROP, op_errno), gf_error_to_errno (rsp.op_errno), PC_MSG_REMOTE_OP_FAILED, "remote operation failed. " "Path: %s (%s)", diff --git a/xlators/protocol/server/src/server-rpc-fops.c b/xlators/protocol/server/src/server-rpc-fops.c index bfaf81ee8d..91644ce010 100644 --- a/xlators/protocol/server/src/server-rpc-fops.c +++ b/xlators/protocol/server/src/server-rpc-fops.c @@ -1707,8 +1707,8 @@ server_xattrop_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (op_ret < 0) { state = CALL_STATE (frame); - gf_msg (this->name, GF_LOG_INFO, op_errno, - PS_MSG_XATTROP_INFO, + gf_msg (this->name, fop_log_level (GF_FOP_XATTROP, op_errno), + op_errno, PS_MSG_XATTROP_INFO, "%"PRId64": XATTROP %s (%s) ==> (%s)", frame->root->unique, state->loc.path, uuid_utoa (state->resolve.gfid), diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c index b621580d3e..8e1c12e151 100644 --- a/xlators/storage/posix/src/posix.c +++ b/xlators/storage/posix/src/posix.c @@ -5444,8 +5444,8 @@ _posix_handle_xattr_keyvalue_pair (dict_t *d, char *k, data_t *v, !posix_special_xattr (marker_xattrs, k)) { if (filler->real_path) - gf_msg (this->name, GF_LOG_ERROR, - op_errno, P_MSG_XATTR_FAILED, + gf_msg (this->name, fop_log_level (GF_FOP_XATTROP, + op_errno), op_errno, P_MSG_XATTR_FAILED, "getxattr failed on %s while " "doing xattrop: Key:%s ", filler->real_path, k); -- cgit