From 34e65c4b3aac3cbe80ec336c367b78b01376a7a3 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Mon, 13 Jul 2015 00:53:20 +0530 Subject: cluster/ec: Prevent data corruptions - On lock reuse preserve 'healing' bits - Don't set ctx->size outside locks in healing code - Allow xattrop internal fops also on the fop->mask. Change-Id: I6b76da5d7ebe367d8f3552cbf9fd18e556f2a171 BUG: 1232678 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.org/11640 Tested-by: NetBSD Build System Tested-by: Gluster Build System Reviewed-by: Xavier Hernandez --- xlators/cluster/ec/src/ec-common.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'xlators/cluster/ec/src/ec-common.c') diff --git a/xlators/cluster/ec/src/ec-common.c b/xlators/cluster/ec/src/ec-common.c index af5a30fe3de..1c49eba7735 100644 --- a/xlators/cluster/ec/src/ec-common.c +++ b/xlators/cluster/ec/src/ec-common.c @@ -401,6 +401,18 @@ ec_must_wind (ec_fop_data_t *fop) return _gf_false; } +static gf_boolean_t +ec_internal_op (ec_fop_data_t *fop) +{ + if (ec_must_wind (fop)) + return _gf_true; + if (fop->id == GF_FOP_XATTROP) + return _gf_true; + if (fop->id == GF_FOP_FXATTROP) + return _gf_true; + return _gf_false; +} + int32_t ec_child_select(ec_fop_data_t * fop) { ec_t * ec = fop->xl->private; @@ -413,8 +425,9 @@ int32_t ec_child_select(ec_fop_data_t * fop) /* Wind the fop on same subvols as parent for any internal extra fops like * head/tail read in case of writev fop. Unlocks shouldn't do this because * unlock should go on all subvols where lock is performed*/ - if (fop->parent && !ec_must_wind (fop)) + if (fop->parent && !ec_internal_op (fop)) { fop->mask &= (fop->parent->mask & ~fop->parent->healing); + } mask = ec->xl_up; if (fop->parent == NULL) @@ -972,6 +985,7 @@ out: parent->mask &= fop->good; /*As of now only data healing marks bricks as healing*/ + lock->healing |= fop->healing; if (ec_is_data_fop (parent->id)) { parent->healing |= fop->healing; } @@ -996,9 +1010,13 @@ void ec_get_size_version(ec_lock_link_t *link) lock = link->lock; ctx = lock->ctx; + fop = link->fop; /* If ec metadata has already been retrieved, do not try again. */ if (ctx->have_info) { + if (ec_is_data_fop (fop->id)) { + fop->healing |= lock->healing; + } return; } @@ -1008,8 +1026,6 @@ void ec_get_size_version(ec_lock_link_t *link) return; } - fop = link->fop; - uid = fop->frame->root->uid; gid = fop->frame->root->gid; @@ -1274,6 +1290,7 @@ int32_t ec_locked(call_frame_t *frame, void *cookie, xlator_t *this, link = fop->data; lock = link->lock; lock->mask = lock->good_mask = fop->good; + lock->healing = 0; ec_lock_acquired(link); ec_lock(fop->parent); -- cgit