diff options
| author | Pranith Kumar K <pkarampu@redhat.com> | 2019-07-18 11:25:31 +0530 |
|---|---|---|
| committer | Pranith Kumar K <pkarampu@redhat.com> | 2019-10-30 13:48:18 +0530 |
| commit | eb1e0b17d292c0f7ceda5256da186d96a364b7f6 (patch) | |
| tree | 48f879c498aa90391e4feae513a7c128011ee3c8 | |
| parent | be7efe61efeb1552c30cb96ece6c11446a913484 (diff) | |
cluster/ec: Always read from good-mask
There are cases where fop->mask may have fop->healing added
and readv shouldn't be wound on fop->healing. To avoid this
always wind readv to lock->good_mask
updates: bz#1739449
Change-Id: I2226ef0229daf5ff315d51e868b980ee48060b87
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
| -rw-r--r-- | xlators/cluster/ec/src/ec-common.c | 3 | ||||
| -rw-r--r-- | xlators/cluster/ec/src/ec-inode-write.c | 27 |
2 files changed, 25 insertions, 5 deletions
diff --git a/xlators/cluster/ec/src/ec-common.c b/xlators/cluster/ec/src/ec-common.c index db1ff5b0f97..28b31c913c9 100644 --- a/xlators/cluster/ec/src/ec-common.c +++ b/xlators/cluster/ec/src/ec-common.c @@ -654,6 +654,9 @@ ec_child_select(ec_fop_data_t *fop) * unlock should go on all subvols where lock is performed*/ if (fop->parent && !ec_internal_op(fop)) { fop->mask &= (fop->parent->mask & ~fop->parent->healing); + if (ec_is_data_fop(fop->id)) { + fop->healing |= fop->parent->healing; + } } if ((fop->mask & ~ec->xl_up) != 0) { diff --git a/xlators/cluster/ec/src/ec-inode-write.c b/xlators/cluster/ec/src/ec-inode-write.c index a45e6d6ef68..4f35b6d7bd2 100644 --- a/xlators/cluster/ec/src/ec-inode-write.c +++ b/xlators/cluster/ec/src/ec-inode-write.c @@ -1977,6 +1977,20 @@ ec_get_and_merge_stripe(ec_t *ec, ec_fop_data_t *fop, ec_stripe_part_t which) return found; } +static uintptr_t +ec_get_lock_good_mask(inode_t *inode, xlator_t *xl) +{ + ec_lock_t *lock = NULL; + ec_inode_t *ictx = NULL; + LOCK(&inode->lock); + { + ictx = __ec_inode_get(inode, xl); + lock = ictx->inode_lock; + } + UNLOCK(&inode->lock); + return lock->good_mask; +} + void ec_writev_start(ec_fop_data_t *fop) { @@ -2022,9 +2036,10 @@ ec_writev_start(ec_fop_data_t *fop) err = -ENOMEM; goto failed_xdata; } - ec_readv(fop->frame, fop->xl, -1, EC_MINIMUM_MIN, - ec_writev_merge_head, NULL, fd, ec->stripe_size, - fop->offset, 0, xdata); + ec_readv(fop->frame, fop->xl, + ec_get_lock_good_mask(fop->fd->inode, fop->xl), + EC_MINIMUM_MIN, ec_writev_merge_head, NULL, fd, + ec->stripe_size, fop->offset, 0, xdata); } } else { memset(fop->vector[0].iov_base, 0, fop->head); @@ -2047,8 +2062,10 @@ ec_writev_start(ec_fop_data_t *fop) err = -ENOMEM; goto failed_xdata; } - ec_readv(fop->frame, fop->xl, -1, EC_MINIMUM_MIN, - ec_writev_merge_tail, NULL, fd, ec->stripe_size, + ec_readv(fop->frame, fop->xl, + ec_get_lock_good_mask(fop->fd->inode, fop->xl), + EC_MINIMUM_MIN, ec_writev_merge_tail, NULL, fd, + ec->stripe_size, fop->offset + fop->size - ec->stripe_size, 0, xdata); } } else { |