diff options
| -rw-r--r-- | tests/bugs/bug-916226.t | 26 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-common.c | 3 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-transaction.c | 25 |
3 files changed, 33 insertions, 21 deletions
diff --git a/tests/bugs/bug-916226.t b/tests/bugs/bug-916226.t new file mode 100644 index 00000000000..1a4870f2e15 --- /dev/null +++ b/tests/bugs/bug-916226.t @@ -0,0 +1,26 @@ +#!/bin/bash + +. $(dirname $0)/../include.rc +. $(dirname $0)/../volume.rc + +cleanup; + +TEST glusterd +TEST pidof glusterd + +TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}0 $H0:$B0/${V0}1 $H0:$B0/${V0}2 $H0:$B0/${V0}3 +TEST $CLI volume set $V0 cluster.eager-lock on +TEST $CLI volume start $V0 + +## Mount FUSE +TEST glusterfs -s $H0 --volfile-id $V0 $M0; + +TEST mkdir $M0/dir{1..10}; +TEST touch $M0/dir{1..10}/files{1..10}; + +TEST $CLI volume add-brick $V0 $H0:$B0/${V0}4 $H0:/$B0/${V0}5 + +TEST $CLI volume rebalance $V0 start force +EXPECT_WITHIN 60 "success:" rebalance_status_field $V0 + +cleanup; diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index efbb70902da..537b9c2062a 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -3990,7 +3990,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); |