summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAshish Pandey <aspandey@redhat.com>2016-01-20 14:30:08 +0530
committerNiels de Vos <ndevos@redhat.com>2016-05-30 07:38:00 -0700
commit6afe7fb246ece2ee2c10d98fdbd4d331ef43a56b (patch)
tree65c248a556f44bac2eea4358b58e477f3b28f0e2
parentd1ab0268179ae2127ea4c2d5e7e6d5554f11c92b (diff)
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 <aspandey@redhat.com> > Reviewed-on: http://review.gluster.org/13266 > Smoke: Gluster Build System <jenkins@build.gluster.com> > Reviewed-by: Xavier Hernandez <xhernandez@datalab.es> > NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> > CentOS-regression: Gluster Build System <jenkins@build.gluster.com> > Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com> Change-Id: Ia824c71e75ab683d3cb8949e1966ea09c9ccce72 BUG: 1254934 Signed-off-by: Ashish Pandey <aspandey@redhat.com> Reviewed-on: http://review.gluster.org/14520 NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> Smoke: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com> Reviewed-by: Niels de Vos <ndevos@redhat.com>
-rw-r--r--xlators/cluster/ec/src/ec-combine.c2
-rw-r--r--xlators/cluster/ec/src/ec-generic.c2
-rw-r--r--xlators/protocol/client/src/client-rpc-fops.c2
-rw-r--r--xlators/protocol/server/src/server-rpc-fops.c4
-rw-r--r--xlators/storage/posix/src/posix.c4
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 4afbc5bb2b6..2566cc0d0cf 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 375e49e695c..0ad514908aa 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 872f7635b11..d35d0e04861 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 bfaf81ee8d7..91644ce0103 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 b621580d3e6..8e1c12e1515 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);