diff options
author | Pranith Kumar K <pkarampu@redhat.com> | 2012-10-04 21:26:14 +0530 |
---|---|---|
committer | Vijay Bellur <vbellur@redhat.com> | 2012-12-12 00:20:15 -0500 |
commit | 45ba834588ec087f54c682a49e8af760e3235f26 (patch) | |
tree | 32c541243a11db1af66624aa82292d4fea9780eb | |
parent | 9655be591b83c61546e214c8db7b32f725cbecc1 (diff) |
cluster/afr: Wake up post-op on non-co-operative transaction
Problem:
The problem is observed when kernel untar is done. One file untar
happens every second. The reason for this is, setattr lock is blocked
on the prev fd data-transaction full-lock (because of eager-lock).
Because of post-op-delay the post-op (xattrop + unlock) of the prev
data-transaction happens after 1 sec.
Until this the setattr is blocked resulting in performance problems
in untar.
Fix:
Whenever an loc data, meta-data transaction comes, it should wakeup
the prev-post-op on the same process' fd.
Tests:
The performance problem in untar went away. I put a breakpoint in
client_finodelk for a 2G file dd and the inodelk is hit only 4 times.
This confirms that the change does not affect post-op-delay in a
-ve way.
Change-Id: I32e272727f8ea03ae8768509695bbae183aff17d
BUG: 853679
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/83
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Tested-by: Vijay Bellur <vbellur@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/1876
-rw-r--r-- | xlators/cluster/afr/src/afr-transaction.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/xlators/cluster/afr/src/afr-transaction.c b/xlators/cluster/afr/src/afr-transaction.c index 65dea16df42..6604b75566e 100644 --- a/xlators/cluster/afr/src/afr-transaction.c +++ b/xlators/cluster/afr/src/afr-transaction.c @@ -1417,12 +1417,25 @@ 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) { afr_local_t * local = NULL; afr_private_t * priv = NULL; + fd_t *fd = NULL; local = frame->local; priv = this->private; @@ -1438,6 +1451,15 @@ afr_transaction (call_frame_t *frame, xlator_t *this, afr_transaction_type type) local->transaction.resume = afr_transaction_resume; local->transaction.type = type; + if (_does_transaction_conflict_with_delayed_post_op (frame) && + local->loc.inode) { + fd = fd_lookup (local->loc.inode, frame->root->pid); + if (fd) { + afr_delayed_changelog_wake_up (this, fd); + fd_unref (fd); + } + } + if (afr_lock_server_count (priv, local->transaction.type) == 0) { afr_internal_lock_finish (frame, this); } else { |