diff options
author | Pranith Kumar K <pkarampu@redhat.com> | 2015-06-07 10:24:08 +0530 |
---|---|---|
committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2015-06-18 05:47:15 -0700 |
commit | 56becf03ffd0ddfae4fda4d064a1c91cf1eb57a6 (patch) | |
tree | 3057fa0243e34db9158edc71066df28e9d2f4be9 /xlators/cluster/ec/src/ec-common.c | |
parent | 6eb24012e43dccda5fb71374ffd607d913fb2d59 (diff) |
cluster/ec: Prevent double unwind
Backport of http://review.gluster.com/11111
Problem:
1) ec_access/ec_readlink_/ec_readdir[p] _cbks are trying to recover only from
ENOTCONN.
2) When the fop succeeds it unwinds right away. But when its
ec_fop_manager resumes, if the number of bricks that are up is less than
ec->fragments, the the state machine will resume with -EC_STATE_REPORT which
unwinds again. This will lead to crashes.
Fix:
- If fop fails retry on other subvols, as ESTALE/ENOENT/EBADFD etc are also
recoverable.
- unwind success/failure in _cbks
BUG: 1229331
Change-Id: I7510984a237761efba65e872313a8ede8b7543e5
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/11128
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
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 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xlators/cluster/ec/src/ec-common.c b/xlators/cluster/ec/src/ec-common.c index 05dd386ec65..c2c48c3c3f8 100644 --- a/xlators/cluster/ec/src/ec-common.c +++ b/xlators/cluster/ec/src/ec-common.c @@ -535,11 +535,9 @@ 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, - int32_t op_errno) +int32_t ec_dispatch_one_retry(ec_fop_data_t *fop, int32_t idx, int32_t op_ret) { - if ((op_ret < 0) && (op_errno == ENOTCONN)) - { + if (op_ret < 0) { return (ec_dispatch_next(fop, idx) >= 0); } |