diff options
| author | Xavier Hernandez <xhernandez@datalab.es> | 2015-05-28 16:54:59 +0200 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2015-05-30 05:35:44 -0700 |
| commit | af7e88ad4a3a1cd0b965fdbadb59c923e98550bc (patch) | |
| tree | 76e2d201cc2468549a8c53219cfffeafab623fb3 /xlators/cluster/ec/src/ec-combine.h | |
| parent | 543d24312c1e2082b4f724ee233ceb410abb107b (diff) | |
cluster/ec: Ignore differences in non locked inodes
Backport of http://review.gluster.org/10974
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.
BUG: 1225796
Change-Id: I29f328a7b4895368ded859f3bae0359436c3588f
Signed-off-by: Xavier Hernandez <xhernandez@datalab.es>
Reviewed-on: http://review.gluster.org/10983
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators/cluster/ec/src/ec-combine.h')
| -rw-r--r-- | xlators/cluster/ec/src/ec-combine.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xlators/cluster/ec/src/ec-combine.h b/xlators/cluster/ec/src/ec-combine.h index cae2bb9274f..19a42ded706 100644 --- a/xlators/cluster/ec/src/ec-combine.h +++ b/xlators/cluster/ec/src/ec-combine.h @@ -20,7 +20,8 @@ typedef int32_t (* ec_combine_f)(ec_fop_data_t * fop, ec_cbk_data_t * dst, void ec_iatt_rebuild(ec_t * ec, struct iatt * iatt, int32_t count, int32_t answers); -int32_t ec_iatt_combine(struct iatt * dst, struct iatt * src, int32_t count); +int32_t ec_iatt_combine(ec_fop_data_t *fop, struct iatt *dst, struct iatt *src, + int32_t count); int32_t ec_dict_compare(dict_t * dict1, dict_t * dict2); int32_t ec_vector_compare(struct iovec * dst_vector, int32_t dst_count, struct iovec * src_vector, int32_t src_count); |