cluster/afr: Turn on eager-lock for fd DATA transactions

Problem:
With the present implementation, eager-lock is issued for
any fd fop. eager-lock is being transferred to metadata
transactions. But the lk-owner is set to local->fd address
only for DATA transactions, but for METADATA transactions
it is frame->root. Because of this unlock on the eager-lock fails
and rebalance hangs.

Fix:
Enable eager-lock for fd DATA transactions

This is a backport of change If30df7486a0b2f5e4150d3259d1261f81473ce8a
http://review.gluster.org/#/c/4588/

BUG: 916226
Change-Id: Id41ac17f467c37e7fd8863e0c19932d7b16344f8
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/4899
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>

2 files changed, 7 insertions, 21 deletions

diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index e66be0358c9..eff49b58a2e 100644
--- a/xlators/cluster/afr/src/afr-common.c
+++ b/xlators/cluster/afr/src/afr-common.c
@@ -4009,7 +4009,8 @@ afr_transaction_local_init (afr_local_t *local, xlator_t *this)
                                                            AFR_NUM_CHANGE_LOGS);
         if (!local->transaction.txn_changelog)
                 goto out;
-        local->transaction.eager_lock_on = priv->eager_lock;
+        if (local->fd && (local->transaction.type == AFR_DATA_TRANSACTION))
+                local->transaction.eager_lock_on = priv->eager_lock;
         ret = 0;
 out:
         return ret;
diff --git a/xlators/cluster/afr/src/afr-transaction.c b/xlators/cluster/afr/src/afr-transaction.c
index a8b317878f7..d20928d151d 100644
--- a/xlators/cluster/afr/src/afr-transaction.c
+++ b/xlators/cluster/afr/src/afr-transaction.c
@@ -1445,19 +1445,6 @@ afr_transaction_fop_failed (call_frame_t *frame, xlator_t *this, int child_index
                            child_index, local->transaction.type);
 }
 
-gf_boolean_t
-_does_transaction_conflict_with_delayed_post_op (call_frame_t *frame)
-{
-        afr_local_t     *local = frame->local;
-        //check if it is going to compete with inode lock from the fd
-        if (local->fd)
-                return _gf_false;
-        if ((local->transaction.type == AFR_DATA_TRANSACTION) ||
-            (local->transaction.type == AFR_METADATA_TRANSACTION))
-                return _gf_true;
-        return _gf_false;
-}
-
 int
 afr_transaction (call_frame_t *frame, xlator_t *this, afr_transaction_type type)
 {
@@ -1469,22 +1456,20 @@ afr_transaction (call_frame_t *frame, xlator_t *this, afr_transaction_type type)
         local = frame->local;
         priv  = this->private;
 
+        local->transaction.resume = afr_transaction_resume;
+        local->transaction.type   = type;
+
         ret = afr_transaction_local_init (local, this);
         if (ret < 0) {
             goto out;
         }
 
-        local->transaction.resume = afr_transaction_resume;
-        local->transaction.type   = type;
-
-        if (local->fd && local->transaction.eager_lock_on &&
-            local->transaction.type == AFR_DATA_TRANSACTION)
+        if (local->fd && local->transaction.eager_lock_on)
                 afr_set_lk_owner (frame, this, local->fd);
         else
                 afr_set_lk_owner (frame, this, frame->root);
 
-        if (_does_transaction_conflict_with_delayed_post_op (frame) &&
-            local->loc.inode) {
+        if (!local->transaction.eager_lock_on && local->loc.inode) {
                 fd = fd_lookup (local->loc.inode, frame->root->pid);
                 if (fd) {
                         afr_delayed_changelog_wake_up (this, fd);