diff options
| author | Ashish Pandey <aspandey@redhat.com> | 2017-04-05 17:13:25 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2017-04-12 07:51:05 -0400 |
| commit | e536bea09aa0776164716f9a0d480584c0a761f2 (patch) | |
| tree | 9fa4f7769cdc35eae81638457b096a81ce5afeb6 /xlators | |
| parent | 1b01bdcc8effb9b5342edbe669b9e2b2c36bfc80 (diff) | |
| download | glusterfs-e536bea09aa0776164716f9a0d480584c0a761f2.tar.gz glusterfs-e536bea09aa0776164716f9a0d480584c0a761f2.tar.xz glusterfs-e536bea09aa0776164716f9a0d480584c0a761f2.zip | |
cluster/ec : Don't count healing brick as healthy brick
In ec_child_select, we should send fop on healing bricks
unconditionaly but to check the number of healthy bricks
against fragments and minimum count, we should not count
these healing bricks.
Count bits of fop->mask before adding ealing brick to
fop->mask
Change-Id: I3fa80bdd5ca34ca070d610116b84154b917c5999
BUG: 1439527
Signed-off-by: Ashish Pandey <aspandey@redhat.com>
Reviewed-on: https://review.gluster.org/17007
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/cluster/ec/src/ec-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xlators/cluster/ec/src/ec-common.c b/xlators/cluster/ec/src/ec-common.c index a46cf6b1c5..2231a8da1f 100644 --- a/xlators/cluster/ec/src/ec-common.c +++ b/xlators/cluster/ec/src/ec-common.c @@ -488,6 +488,7 @@ int32_t ec_child_select(ec_fop_data_t * fop) ec->idx = first; } + num = gf_bits_count(fop->mask); /*Unconditionally wind on healing subvolumes*/ fop->mask |= fop->healing; fop->remaining = fop->mask; @@ -495,7 +496,6 @@ int32_t ec_child_select(ec_fop_data_t * fop) ec_trace("SELECT", fop, ""); - num = gf_bits_count(fop->mask); if ((num < fop->minimum) && (num < ec->fragments)) { gf_msg (ec->xl->name, GF_LOG_ERROR, 0, |