diff options
Diffstat (limited to '0272-cluster-ec-Always-read-from-good-mask.patch')
| -rw-r--r-- | 0272-cluster-ec-Always-read-from-good-mask.patch | 90 |
1 files changed, 90 insertions, 0 deletions
diff --git a/0272-cluster-ec-Always-read-from-good-mask.patch b/0272-cluster-ec-Always-read-from-good-mask.patch new file mode 100644 index 0000000..a6193e4 --- /dev/null +++ b/0272-cluster-ec-Always-read-from-good-mask.patch @@ -0,0 +1,90 @@ +From 220b95085847b5f6a9e5bee7a9519efe72600e6a Mon Sep 17 00:00:00 2001 +From: Pranith Kumar K <pkarampu@redhat.com> +Date: Thu, 18 Jul 2019 11:25:31 +0530 +Subject: [PATCH 272/276] 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 + +Upstream-patch: https://review.gluster.org/c/glusterfs/+/23069 +fixes: bz#1730914 +Change-Id: I2226ef0229daf5ff315d51e868b980ee48060b87 +Signed-off-by: Pranith Kumar K <pkarampu@redhat.com> +Reviewed-on: https://code.engineering.redhat.com/gerrit/177976 +Tested-by: RHGS Build Bot <nigelb@redhat.com> +Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com> +--- + xlators/cluster/ec/src/ec-common.c | 3 +++ + 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 db1ff5b..28b31c9 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 a45e6d6..4f35b6d 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 { +-- +1.8.3.1 + |