diff options
author | Pranith Kumar K <pkarampu@redhat.com> | 2015-06-07 10:24:08 +0530 |
---|---|---|
committer | Vijay Bellur <vbellur@redhat.com> | 2015-06-08 22:09:20 -0700 |
commit | 31866a490edf5b92886accac67eddf78b291d710 (patch) | |
tree | 3129f4bbb6b33c751d082112f41e05c03d0e30d5 /xlators/cluster/ec/src/ec-inode-read.c | |
parent | 7ca78f7a6466a0f2ff19caff526f6560b5275f69 (diff) |
cluster/ec: Prevent double unwind
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
Change-Id: I2cac3c2f9669a4e6160f1ff4abc39f0299303222
BUG: 1228952
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/11111
Reviewed-by: Xavier Hernandez <xhernandez@datalab.es>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators/cluster/ec/src/ec-inode-read.c')
-rw-r--r-- | xlators/cluster/ec/src/ec-inode-read.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xlators/cluster/ec/src/ec-inode-read.c b/xlators/cluster/ec/src/ec-inode-read.c index ae02e964c3d..ef2170f8924 100644 --- a/xlators/cluster/ec/src/ec-inode-read.c +++ b/xlators/cluster/ec/src/ec-inode-read.c @@ -35,7 +35,7 @@ int32_t ec_access_cbk(call_frame_t * frame, void * cookie, xlator_t * this, ec_trace("CBK", fop, "idx=%d, frame=%p, op_ret=%d, op_errno=%d", idx, frame, op_ret, op_errno); - if (!ec_dispatch_one_retry(fop, idx, op_ret, op_errno)) + if (!ec_dispatch_one_retry(fop, idx, op_ret)) { if (fop->cbks.access != NULL) { @@ -73,13 +73,13 @@ int32_t ec_manager_access(ec_fop_data_t * fop, int32_t state) return EC_STATE_REPORT; case -EC_STATE_INIT: - case -EC_STATE_REPORT: if (fop->cbks.access != NULL) { fop->cbks.access(fop->req_frame, fop, fop->xl, -1, fop->error, NULL); } + case -EC_STATE_REPORT: case EC_STATE_REPORT: return EC_STATE_END; @@ -968,7 +968,7 @@ int32_t ec_readlink_cbk(call_frame_t * frame, void * cookie, xlator_t * this, ec_iatt_rebuild(fop->xl->private, buf, 1, 1); } - if (!ec_dispatch_one_retry(fop, idx, op_ret, op_errno)) + if (!ec_dispatch_one_retry(fop, idx, op_ret)) { if (fop->cbks.readlink != NULL) { @@ -1006,7 +1006,6 @@ int32_t ec_manager_readlink(ec_fop_data_t * fop, int32_t state) return EC_STATE_REPORT; case -EC_STATE_INIT: - case -EC_STATE_REPORT: if (fop->cbks.readlink != NULL) { fop->cbks.readlink(fop->req_frame, fop, fop->xl, -1, @@ -1014,6 +1013,7 @@ int32_t ec_manager_readlink(ec_fop_data_t * fop, int32_t state) } case EC_STATE_REPORT: + case -EC_STATE_REPORT: return EC_STATE_END; default: |