From 0f63bda0df91ee7ff42e3262c74220178ef87a21 Mon Sep 17 00:00:00 2001 From: Ashish Pandey Date: Thu, 19 Jan 2017 18:20:44 +0530 Subject: cluster/disperse: Do not log fop failed for lockless fops Problem: Operation failed messages are getting logged based on the callbacks of lockless fop's. If a fop does not take a lock, it is possible that it will get some out of sync xattr, iatts. We can not depend on these callback to psay that the fop has failed. Solution: Print failed messages only for locked fops. However, heal would still be triggered. >Change-Id: I4427402c8c944c23f16073613caa03ea788bead3 >BUG: 1414287 >Signed-off-by: Ashish Pandey >Reviewed-on: http://review.gluster.org/16435 >Reviewed-by: Xavier Hernandez >Smoke: Gluster Build System >NetBSD-regression: NetBSD Build System >CentOS-regression: Gluster Build System >Signed-off-by: Ashish Pandey Change-Id: I4427402c8c944c23f16073613caa03ea788bead3 BUG: 1415082 Signed-off-by: Ashish Pandey Reviewed-on: https://review.gluster.org/16439 Reviewed-by: Xavier Hernandez Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System --- xlators/cluster/ec/src/ec-common.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/xlators/cluster/ec/src/ec-common.c b/xlators/cluster/ec/src/ec-common.c index 296de1d9046..51800263634 100644 --- a/xlators/cluster/ec/src/ec-common.c +++ b/xlators/cluster/ec/src/ec-common.c @@ -107,13 +107,15 @@ void ec_check_status(ec_fop_data_t * fop) } } - gf_msg (fop->xl->name, GF_LOG_WARNING, 0, - EC_MSG_OP_FAIL_ON_SUBVOLS, - "Operation failed on some " - "subvolumes (up=%lX, mask=%lX, " - "remaining=%lX, good=%lX, bad=%lX)", - ec->xl_up, fop->mask, fop->remaining, fop->good, - ec->xl_up & ~(fop->remaining | fop->good)); + if (fop->lock_count > 0) { + gf_msg (fop->xl->name, GF_LOG_WARNING, 0, + EC_MSG_OP_FAIL_ON_SUBVOLS, + "Operation failed on some " + "subvolumes (up=%lX, mask=%lX, " + "remaining=%lX, good=%lX, bad=%lX)", + ec->xl_up, fop->mask, fop->remaining, fop->good, + ec->xl_up & ~(fop->remaining | fop->good)); + } if (fop->use_fd) { -- cgit