diff options
| author | Pranith Kumar K <pkarampu@redhat.com> | 2015-06-15 16:32:06 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2015-07-01 23:42:17 -0700 |
| commit | ab74e66f1724d5ca8cfe15bd4d91a3b7da1c62bd (patch) | |
| tree | 61394edc7c3c57b49e4ff7e00d3e02181f452090 /xlators/cluster/ec/src/ec-combine.c | |
| parent | b5d5ae55a1d6a2dc290b23c9f6b640fcece48118 (diff) | |
cluster/ec: wind fops on good subvols for access/readdir[p]
Backport of http://review.gluster.com/11246
BUG: 1234679
Change-Id: I2d774f62740c82e922efab50fc78fa74050ede93
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/11357
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators/cluster/ec/src/ec-combine.c')
| -rw-r--r-- | xlators/cluster/ec/src/ec-combine.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/xlators/cluster/ec/src/ec-combine.c b/xlators/cluster/ec/src/ec-combine.c index 256e09eff31..f3905ce9216 100644 --- a/xlators/cluster/ec/src/ec-combine.c +++ b/xlators/cluster/ec/src/ec-combine.c @@ -903,7 +903,7 @@ void ec_combine (ec_cbk_data_t *newcbk, ec_combine_f combine) ec_fop_data_t *fop = newcbk->fop; ec_cbk_data_t *cbk = NULL, *tmp = NULL; struct list_head *item = NULL; - int32_t needed = 0, resume = 0; + int32_t needed = 0; char str[32]; LOCK(&fop->lock); @@ -940,12 +940,6 @@ void ec_combine (ec_cbk_data_t *newcbk, ec_combine_f combine) ec_trace("ANSWER", fop, "combine=%s[%d]", ec_bin(str, sizeof(str), newcbk->mask, 0), newcbk->count); - if ((newcbk->count == fop->expected) && (fop->answer == NULL)) { - fop->answer = newcbk; - - resume = 1; - } - cbk = list_entry(fop->cbk_list.next, ec_cbk_data_t, list); if ((fop->mask ^ fop->remaining) == fop->received) { needed = fop->minimum - cbk->count; @@ -955,9 +949,5 @@ void ec_combine (ec_cbk_data_t *newcbk, ec_combine_f combine) if (needed > 0) { ec_dispatch_next(fop, newcbk->idx); - } else if (resume) { - ec_update_bad(fop, newcbk->mask); - - ec_resume(fop, 0); } } |