|
 |
d1681e |
From ecbb79d192695e06345036aa4f24e0f029ce8b02 Mon Sep 17 00:00:00 2001
|
|
|
d1681e |
From: Pranith Kumar K <pkarampu@redhat.com>
|
|
|
d1681e |
Date: Fri, 17 Nov 2017 07:20:21 +0530
|
|
|
d1681e |
Subject: [PATCH 234/236] ec: Use tiebreaker_inodelk where necessary
|
|
|
d1681e |
|
|
|
d1681e |
When there are big directories or files that need to be healed,
|
|
|
d1681e |
other shds are stuck on getting lock on self-heal domain for these
|
|
|
d1681e |
directories/files. If there is a tie-breaker logic, other shds
|
|
|
d1681e |
can heal some other files/directories while 1 of the shds is healing
|
|
|
d1681e |
the big file/directory.
|
|
|
d1681e |
|
|
|
d1681e |
Before this patch:
|
|
|
d1681e |
96.67 4890.64 us 12.89 us 646115887.30us 340869 INODELK
|
|
|
d1681e |
After this patch:
|
|
|
d1681e |
40.76 42.35 us 15.09 us 6546.50us 438478 INODELK
|
|
|
d1681e |
|
|
|
d1681e |
>Fixes gluster/glusterfs#354
|
|
|
d1681e |
|
|
|
d1681e |
Upstream-patch: https://review.gluster.org/18820
|
|
|
d1681e |
BUG: 1562744
|
|
|
d1681e |
Change-Id: Ia995b5576b44f770c064090705c78459e543cc64
|
|
|
d1681e |
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
|
|
|
d1681e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/134280
|
|
|
d1681e |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
d1681e |
Reviewed-by: Ashish Pandey <aspandey@redhat.com>
|
|
|
d1681e |
---
|
|
|
d1681e |
xlators/cluster/ec/src/ec-heal.c | 19 +++++++++++--------
|
|
|
d1681e |
1 file changed, 11 insertions(+), 8 deletions(-)
|
|
|
d1681e |
|
|
|
d1681e |
diff --git a/xlators/cluster/ec/src/ec-heal.c b/xlators/cluster/ec/src/ec-heal.c
|
|
|
d1681e |
index 8e02986..a1d3f3d 100644
|
|
|
d1681e |
--- a/xlators/cluster/ec/src/ec-heal.c
|
|
|
d1681e |
+++ b/xlators/cluster/ec/src/ec-heal.c
|
|
|
d1681e |
@@ -1562,9 +1562,9 @@ ec_heal_entry (call_frame_t *frame, ec_t *ec, inode_t *inode,
|
|
|
d1681e |
sprintf (selfheal_domain, "%s:self-heal", ec->xl->name);
|
|
|
d1681e |
ec_mask_to_char_array (ec->xl_up, up_subvols, ec->nodes);
|
|
|
d1681e |
/*If other processes are already doing the heal, don't block*/
|
|
|
d1681e |
- ret = cluster_inodelk (ec->xl_list, up_subvols, ec->nodes, replies,
|
|
|
d1681e |
- locked_on, frame, ec->xl, selfheal_domain, inode,
|
|
|
d1681e |
- 0, 0);
|
|
|
d1681e |
+ ret = cluster_tiebreaker_inodelk (ec->xl_list, up_subvols, ec->nodes,
|
|
|
d1681e |
+ replies, locked_on, frame, ec->xl,
|
|
|
d1681e |
+ selfheal_domain, inode, 0, 0);
|
|
|
d1681e |
{
|
|
|
d1681e |
if (ret <= ec->fragments) {
|
|
|
d1681e |
gf_msg_debug (ec->xl->name, 0, "%s: Skipping heal "
|
|
|
d1681e |
@@ -2400,9 +2400,10 @@ ec_heal_data (call_frame_t *frame, ec_t *ec, gf_boolean_t block, inode_t *inode,
|
|
|
d1681e |
locked_on, frame, ec->xl,
|
|
|
d1681e |
selfheal_domain, inode, 0, 0);
|
|
|
d1681e |
} else {
|
|
|
d1681e |
- ret = cluster_tryinodelk (ec->xl_list, output, ec->nodes,
|
|
|
d1681e |
- replies, locked_on, frame, ec->xl,
|
|
|
d1681e |
- selfheal_domain, inode, 0, 0);
|
|
|
d1681e |
+ ret = cluster_tiebreaker_inodelk (ec->xl_list, output,
|
|
|
d1681e |
+ ec->nodes, replies, locked_on,
|
|
|
d1681e |
+ frame, ec->xl,
|
|
|
d1681e |
+ selfheal_domain, inode, 0, 0);
|
|
|
d1681e |
}
|
|
|
d1681e |
{
|
|
|
d1681e |
if (ret <= ec->fragments) {
|
|
|
d1681e |
@@ -2453,8 +2454,10 @@ ec_heal_do (xlator_t *this, void *data, loc_t *loc, int32_t partial)
|
|
|
d1681e |
|
|
|
d1681e |
/* If it is heal request from getxattr, complete the heal and then
|
|
|
d1681e |
* unwind, if it is ec_heal with NULL as frame then no need to block
|
|
|
d1681e |
- * the heal as the caller doesn't care about its completion*/
|
|
|
d1681e |
- if (fop->req_frame)
|
|
|
d1681e |
+ * the heal as the caller doesn't care about its completion. In case
|
|
|
d1681e |
+ * of heald whichever gets tiebreaking inodelk will take care of the
|
|
|
d1681e |
+ * heal, so no need to block*/
|
|
|
d1681e |
+ if (fop->req_frame && !ec->shd.iamshd)
|
|
|
d1681e |
blocking = _gf_true;
|
|
|
d1681e |
|
|
|
d1681e |
frame = create_frame (this, this->ctx->pool);
|
|
|
d1681e |
--
|
|
|
d1681e |
1.8.3.1
|
|
|
d1681e |
|