cluster/afr: Perform wakeup just before fop

There is no necessity for the delayed-post-op to wait until
the next fop phase on the fd completes. Change-log,
locks are inherited by the time next fop phase is attempted
so the wakeup can happen just before the fop phase is started.

Change-Id: I0b8e591f591b0f7565eb55265ab51f476ed2b165
BUG: 908302
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/4073
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-by: Anand Avati <avati@redhat.com>

1 files changed, 14 insertions, 13 deletions

diff --git a/xlators/cluster/afr/src/afr-transaction.c b/xlators/cluster/afr/src/afr-transaction.c
index 4e7ed55a0..c0316f86a 100644
--- a/xlators/cluster/afr/src/afr-transaction.c
+++ b/xlators/cluster/afr/src/afr-transaction.c
@@ -220,9 +220,12 @@ afr_transaction_perform_fop (call_frame_t *frame, xlator_t *this)
 {
         afr_local_t     *local = NULL;
         afr_private_t   *priv = NULL;
+        fd_t            *fd   = NULL;
 
         local = frame->local;
         priv  = this->private;
+        fd    = local->fd;
+
         __mark_all_success (local->pending, priv->child_count,
                             local->transaction.type);
 
@@ -236,6 +239,17 @@ afr_transaction_perform_fop (call_frame_t *frame, xlator_t *this)
         frame->root->lk_owner =
                 local->transaction.main_frame->root->lk_owner;
 
+
+        /* The wake up needs to happen independent of
+           what type of fop arrives here. If it was
+           a write, then it has already inherited the
+           lock and changelog. If it was not a write,
+           then the presumption of the optimization (of
+           optimizing for successive write operations)
+           fails.
+        */
+        if (fd)
+                afr_delayed_changelog_wake_up (this, fd);
         local->transaction.fop (frame, this);
 }
 
@@ -1392,23 +1406,10 @@ afr_transaction_resume (call_frame_t *frame, xlator_t *this)
         afr_internal_lock_t *int_lock = NULL;
         afr_local_t         *local    = NULL;
         afr_private_t       *priv     = NULL;
-	fd_t                *fd = NULL;
 
         local    = frame->local;
         int_lock = &local->internal_lock;
         priv     = this->private;
-	fd       = local->fd;
-
-	if (fd)
-		/* The wake up needs to happen independent of
-		   what type of fop arrives here. If it was
-		   a write, then it has already inherited the
-		   lock and changelog. If it was not a write,
-		   then the presumption of the optimization (of
-		   optimizing for successive write operations)
-		   fails.
-		*/
-		afr_delayed_changelog_wake_up (this, fd);
 
 	afr_restore_lk_owner (frame);