diff options
| author | Pranith Kumar K <pkarampu@redhat.com> | 2015-07-01 14:25:07 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2015-07-21 23:27:12 -0700 |
| commit | 69e15a1d7ff40188872f87af8e8c80f4e891746a (patch) | |
| tree | a59f81e5616c0a64b7407625a7890fc0a1738ff7 /xlators/cluster/ec/src/ec-common.c | |
| parent | 42b834669a08547de953eb42d6cc1601461c7fbb (diff) | |
cluster/ec: wind readlink on good subvol(s)
>BUG: 1232172
>Change-Id: I3a56e487840d86147dd85bf5fbe79b165eae289f
>Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
>Reviewed-on: http://review.gluster.org/11589
>Tested-by: NetBSD Build System <jenkins@build.gluster.org>
>Reviewed-by: Xavier Hernandez <xhernandez@datalab.es>
>Tested-by: Gluster Build System <jenkins@build.gluster.com>
BUG: 1234679
Change-Id: I08560eee095a3921e9c24f16dc2a242a76018a42
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/11687
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Xavier Hernandez <xhernandez@datalab.es>
Diffstat (limited to 'xlators/cluster/ec/src/ec-common.c')
| -rw-r--r-- | xlators/cluster/ec/src/ec-common.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/xlators/cluster/ec/src/ec-common.c b/xlators/cluster/ec/src/ec-common.c index 0a173bf0104..26c62deea77 100644 --- a/xlators/cluster/ec/src/ec-common.c +++ b/xlators/cluster/ec/src/ec-common.c @@ -583,13 +583,16 @@ void ec_dispatch_one(ec_fop_data_t * fop) } } -int32_t ec_dispatch_one_retry(ec_fop_data_t *fop, int32_t idx, int32_t op_ret) +gf_boolean_t +ec_dispatch_one_retry(ec_fop_data_t *fop, ec_cbk_data_t *cbk) { - if (op_ret < 0) { - return (ec_dispatch_next(fop, idx) >= 0); - } - - return 0; + if ((cbk->op_ret < 0) && ec_is_recoverable_error (cbk->op_errno)) { + GF_ASSERT (fop->mask & (1ULL<<cbk->idx)); + fop->mask ^= (1ULL << cbk->idx); + if (fop->mask) + return _gf_true; + } + return _gf_false; } void ec_dispatch_inc(ec_fop_data_t * fop) @@ -1935,6 +1938,7 @@ void __ec_manager(ec_fop_data_t * fop, int32_t error) fop->jobs = 1; fop->state = fop->handler(fop, fop->state); + GF_ASSERT (fop->state >= 0); error = ec_check_complete(fop, __ec_manager); } while (error >= 0); |