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>

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: