diff options
| author | Richard Wareing <rwareing@fb.com> | 2015-09-29 15:35:08 -0700 |
|---|---|---|
| committer | Jeff Darcy <jeff@pl.atyp.us> | 2017-09-09 00:39:44 +0000 |
| commit | e8fac4c883de8e8e1f2ef949e7a8897605adff0e (patch) | |
| tree | fdc74d5afc8a2e64076bb8740aa40c05e49ffb41 | |
| parent | 0f0d00e8a53e0220b2eb81ad159b12e475ea2afb (diff) | |
cluster/afr: SHD should not use did_discovery code paths
Summary: - Exempt the SHD from the discover code path
Test Plan:
- prove -v tests/bugs/fb8149516.t
- Make rc and canary on offending host (gfsdataswarm048.prn2)
Reviewers: moox, dph, sshreyas
Reviewed By: sshreyas
Differential Revision: https://phabricator.fb.com/D2491694
Change-Id: I691a990950e13be6e376c64fddb110cd6ceefe47
Signed-off-by: Jeff Darcy <jdarcy@fb.com>
Reviewed-on: https://review.gluster.org/18251
Reviewed-by: Jeff Darcy <jeff@pl.atyp.us>
Tested-by: Jeff Darcy <jeff@pl.atyp.us>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.org>
| -rw-r--r-- | xlators/cluster/afr/src/afr-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index 94f43f008a5..c7657dd5a9f 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -1108,7 +1108,7 @@ afr_inode_refresh_done (call_frame_t *frame, xlator_t *this, int error) err = afr_inode_refresh_err (frame, this); if ((ret && afr_selfheal_enabled (this)) || - (priv->did_discovery == _gf_false && + (!priv->shd.iamshd && (priv->did_discovery == _gf_false) && AFR_IS_ROOT_GFID (local->refreshinode->gfid))) { heal_frame = copy_frame (frame); if (!heal_frame) |