summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/afr/src/afr-common.c
diff options
context:
space:
mode:
authorEmmanuel Dreyfus <manu@netbsd.org>2013-04-29 17:15:56 +0200
committerVijay Bellur <vbellur@redhat.com>2013-05-07 05:00:05 -0700
commiteaa3cdcb80befe3fe7c6b181672bface9d4ff539 (patch)
tree17474f0c9b6a9d5e2fe71adec94b6a20038d54e7 /xlators/cluster/afr/src/afr-common.c
parent5925d8a2512b8d4452b0b0efbafd9c7536ed3a51 (diff)
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>
Diffstat (limited to 'xlators/cluster/afr/src/afr-common.c')
-rw-r--r--xlators/cluster/afr/src/afr-common.c3
1 files changed, 2 insertions, 1 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;