From 42b834669a08547de953eb42d6cc1601461c7fbb Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Wed, 8 Jul 2015 17:52:11 +0530 Subject: cluster/ec: Don't read from bricks that are healing >BUG: 1232678 >Change-Id: I35503039e4723cf7f33d6797f0ba90dd0aca130b >Signed-off-by: Pranith Kumar K >Reviewed-on: http://review.gluster.org/11580 >Tested-by: NetBSD Build System >Tested-by: Gluster Build System >Reviewed-by: Xavier Hernandez BUG: 1243647 Change-Id: I4eb45197a5a8d9652eded37ba1e67d9ea745a583 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.org/11685 Reviewed-by: Xavier Hernandez Tested-by: Gluster Build System --- xlators/cluster/ec/src/ec-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xlators/cluster/ec/src/ec-common.c b/xlators/cluster/ec/src/ec-common.c index 439773e1ac8..0a173bf0104 100644 --- a/xlators/cluster/ec/src/ec-common.c +++ b/xlators/cluster/ec/src/ec-common.c @@ -414,7 +414,7 @@ int32_t ec_child_select(ec_fop_data_t * fop) * 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)) - fop->mask &= fop->parent->mask; + fop->mask &= (fop->parent->mask & ~fop->parent->healing); mask = ec->xl_up; if (fop->parent == NULL) -- cgit