diff options
| author | Pranith Kumar K <pkarampu@redhat.com> | 2016-05-04 19:05:28 +0530 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2016-05-14 07:14:37 -0700 |
| commit | c2fce3fb987d5b795ed829c15e28d4b41177076e (patch) | |
| tree | 7d12d2065b8f1361f3318a2ef84a6741e73fcef6 /xlators/cluster | |
| parent | 91dcbfb58ac06b84940d3de9049514465a3acd6b (diff) | |
cluster/afr: Do heals with shd pid
Multi-threaded healing doesn't create synctask with shd pid, this
leads to healing problems when quota exceeds.
>BUG: 1332994
>Change-Id: I80f57c1923756f3298730b8820498127024e1209
>Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
>Reviewed-on: http://review.gluster.org/14211
>Smoke: Gluster Build System <jenkins@build.gluster.com>
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
>CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
>Reviewed-by: Ravishankar N <ravishankar@redhat.com>
BUG: 1335283
Change-Id: If59d8f88d8f4a3ca6a3b6e1c9dfd594dd93f542b
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/14298
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Ravishankar N <ravishankar@redhat.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'xlators/cluster')
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heald.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heald.c b/xlators/cluster/afr/src/afr-self-heald.c index 2ec9d9ce686..545ffa0a1d7 100644 --- a/xlators/cluster/afr/src/afr-self-heald.c +++ b/xlators/cluster/afr/src/afr-self-heald.c @@ -430,10 +430,17 @@ afr_shd_index_sweep (struct subvol_healer *healer, char *vgfid) int ret = 0; xlator_t *subvol = NULL; dict_t *xdata = NULL; + call_frame_t *frame = NULL; priv = healer->this->private; subvol = priv->children[healer->subvol]; + frame = afr_frame_create (healer->this); + if (!frame) { + ret = -ENOMEM; + goto out; + } + loc.inode = afr_shd_index_inode (healer->this, subvol, vgfid); if (!loc.inode) { gf_msg (healer->this->name, GF_LOG_WARNING, @@ -449,7 +456,7 @@ afr_shd_index_sweep (struct subvol_healer *healer, char *vgfid) goto out; } - ret = syncop_mt_dir_scan (subvol, &loc, GF_CLIENT_PID_SELF_HEALD, + ret = syncop_mt_dir_scan (frame, subvol, &loc, GF_CLIENT_PID_SELF_HEALD, healer, afr_shd_index_heal, xdata, priv->shd.max_threads, priv->shd.wait_qlength); @@ -461,6 +468,8 @@ out: if (xdata) dict_unref (xdata); + if (frame) + AFR_STACK_DESTROY (frame); return ret; } |