diff options
| author | Xavier Hernandez <xhernandez@datalab.es> | 2014-11-11 18:45:01 +0100 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2014-12-05 03:39:07 -0800 |
| commit | 36236eecef55c710e1f11ba4a04fe01da67cab6a (patch) | |
| tree | 7e38bc7816ee8a2ae5de1db46b6691a58b17fc10 /xlators/cluster/ec/src/ec-dir-read.c | |
| parent | 318df520945a5d618f45a3a3f680e2b39a278375 (diff) | |
ec: Fix return errors when not enough bricks
Changes introduced by this patch:
* Fix an incorrect error propagation when the state of the life
cycle of a fop returns an error.
* Fix incorrect unlocking of failed locks.
* Return ENOTCONN if there aren't enough bricks online.
* In readdir(p) check that the fd has been successfully open by
a previous opendir.
Change-Id: Ib44f25a1297849ebcbab839332f3b6359f275ebe
BUG: 1162805
Signed-off-by: Xavier Hernandez <xhernandez@datalab.es>
Reviewed-on: http://review.gluster.org/9098
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/cluster/ec/src/ec-dir-read.c')
| -rw-r--r-- | xlators/cluster/ec/src/ec-dir-read.c | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/xlators/cluster/ec/src/ec-dir-read.c b/xlators/cluster/ec/src/ec-dir-read.c index 95d80efdf8b..c705b80fe82 100644 --- a/xlators/cluster/ec/src/ec-dir-read.c +++ b/xlators/cluster/ec/src/ec-dir-read.c @@ -155,8 +155,21 @@ int32_t ec_manager_opendir(ec_fop_data_t * fop, int32_t state) cbk->op_errno = EIO; } } - if (cbk->op_ret < 0) - { + if (cbk->op_ret >= 0) { + /* Save which subvolumes successfully opened the directory. + * If ctx->open is 0, it means that readdir cannot be + * processed in this directory. + */ + LOCK(&fop->fd->lock); + + ctx = __ec_fd_get(fop->fd, fop->xl); + if (ctx != NULL) { + ctx->open |= cbk->mask; + } + + UNLOCK(&fop->fd->lock); + } + if (cbk->op_ret < 0) { ec_fop_set_error(fop, cbk->op_errno); } } @@ -180,6 +193,7 @@ int32_t ec_manager_opendir(ec_fop_data_t * fop, int32_t state) return EC_STATE_LOCK_REUSE; + case -EC_STATE_INIT: case -EC_STATE_LOCK: case -EC_STATE_GET_SIZE_AND_VERSION: case -EC_STATE_DISPATCH: @@ -360,9 +374,20 @@ void ec_wind_readdir(ec_t * ec, ec_fop_data_t * fop, int32_t idx) int32_t ec_manager_readdir(ec_fop_data_t * fop, int32_t state) { + ec_fd_t *ctx; + switch (state) { case EC_STATE_INIT: + /* Return error if opendir has not been successfully called on + * any subvolume. */ + ctx = ec_fd_get(fop->fd, fop->xl); + if ((ctx == NULL) || (ctx->open == 0)) { + fop->error = EINVAL; + + return EC_STATE_REPORT; + } + if (fop->xdata == NULL) { fop->xdata = dict_new(); @@ -402,6 +427,7 @@ int32_t ec_manager_readdir(ec_fop_data_t * fop, int32_t state) return EC_STATE_REPORT; + case -EC_STATE_INIT: case -EC_STATE_REPORT: if (fop->id == GF_FOP_READDIR) { |