From 90ed7128dfd4d10e65efcc866cfd610ba3b0cc30 Mon Sep 17 00:00:00 2001 From: Xavier Hernandez Date: Thu, 28 May 2015 16:54:59 +0200 Subject: cluster/ec: Ignore differences in non locked inodes When ec combines iatt structures from multiple bricks, it checks for equality in important fields. This is ok for iatt related to inodes involved in the operation that have been locked before starting execution. However some fops return iatt information from other inodes. For example a rename locks source and destination parent directories, but it also returns an iatt from the entry itself. In these cases we ignore differences in some fields to avoid false detection of inconsistencies and trigger unnecessary self-heals. Another issue is solved in this patch that caused that the real size of the file stored into the inode context was lost during self-heal. Change-Id: I8b8eca30b2a6c39c7b9bbd3b3b6ba95228fcc041 BUG: 1225793 Signed-off-by: Xavier Hernandez Reviewed-on: http://review.gluster.org/10974 Reviewed-by: Pranith Kumar Karampuri Tested-by: NetBSD Build System --- xlators/cluster/ec/src/ec-generic.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'xlators/cluster/ec/src/ec-generic.c') diff --git a/xlators/cluster/ec/src/ec-generic.c b/xlators/cluster/ec/src/ec-generic.c index f50c7a70560..a455dad9f6b 100644 --- a/xlators/cluster/ec/src/ec-generic.c +++ b/xlators/cluster/ec/src/ec-generic.c @@ -235,8 +235,7 @@ out: int32_t ec_combine_fsync(ec_fop_data_t * fop, ec_cbk_data_t * dst, ec_cbk_data_t * src) { - if (!ec_iatt_combine(dst->iatt, src->iatt, 2)) - { + if (!ec_iatt_combine(fop, dst->iatt, src->iatt, 2)) { gf_log(fop->xl->name, GF_LOG_NOTICE, "Mismatching iatt in " "answers of 'GF_FOP_FSYNC'"); @@ -813,8 +812,7 @@ void ec_lookup_rebuild(ec_t * ec, ec_fop_data_t * fop, ec_cbk_data_t * cbk) int32_t ec_combine_lookup(ec_fop_data_t * fop, ec_cbk_data_t * dst, ec_cbk_data_t * src) { - if (!ec_iatt_combine(dst->iatt, src->iatt, 2)) - { + if (!ec_iatt_combine(fop, dst->iatt, src->iatt, 2)) { gf_log(fop->xl->name, GF_LOG_NOTICE, "Mismatching iatt in " "answers of 'GF_FOP_LOOKUP'"); -- cgit