diff options
| author | Mohammed Rafi KC <rkavunga@redhat.com> | 2019-07-10 21:44:38 +0530 |
|---|---|---|
| committer | Rinku Kothiya <rkothiya@redhat.com> | 2019-09-11 05:04:47 +0000 |
| commit | 072f31bea74d9321a0a71c070265f15d4104f086 (patch) | |
| tree | 6152ecc2f530b56aee14958f71b4213b84973dab /xlators/cluster/afr/src/afr-self-heal-common.c | |
| parent | 81780dba489c5b80063f0824a067ebff0a776241 (diff) | |
afr/lookup: Pass xattr_req in while doing a selfheal in lookup
We were not passing xattr_req when doing a name self heal
as well as a meta data heal. Because of this, some xdata
was missing which causes i/o errors
Backport of > https://review.gluster.org/#/c/glusterfs/+/23024/
>Change-Id: Ibfb1205a7eb0195632dc3820116ffbbb8043545f
>Fixes: bz#1728770
>Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
Fixes: bz#1749305
Change-Id: Ibfb1205a7eb0195632dc3820116ffbbb8043545f
Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
(cherry picked from commit d026f0bcfd301712e4f0671ccf238f43f2e6dd30)
Diffstat (limited to 'xlators/cluster/afr/src/afr-self-heal-common.c')
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-common.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c index 4dc38e14099..9e42a83debc 100644 --- a/xlators/cluster/afr/src/afr-self-heal-common.c +++ b/xlators/cluster/afr/src/afr-self-heal-common.c @@ -1835,7 +1835,7 @@ afr_selfheal_unlocked_lookup_on(call_frame_t *frame, inode_t *parent, int afr_selfheal_unlocked_discover_on(call_frame_t *frame, inode_t *inode, uuid_t gfid, struct afr_reply *replies, - unsigned char *discover_on) + unsigned char *discover_on, dict_t *dict) { loc_t loc = { 0, @@ -1850,6 +1850,8 @@ afr_selfheal_unlocked_discover_on(call_frame_t *frame, inode_t *inode, xattr_req = dict_new(); if (!xattr_req) return -ENOMEM; + if (dict) + dict_copy(dict, xattr_req); if (afr_xattr_req_prepare(frame->this, xattr_req) != 0) { dict_unref(xattr_req); @@ -1875,11 +1877,16 @@ afr_selfheal_unlocked_discover(call_frame_t *frame, inode_t *inode, uuid_t gfid, struct afr_reply *replies) { afr_private_t *priv = NULL; + afr_local_t *local = NULL; + dict_t *dict = NULL; priv = frame->this->private; + local = frame->local; + if (local && local->xattr_req) + dict = local->xattr_req; return afr_selfheal_unlocked_discover_on(frame, inode, gfid, replies, - priv->child_up); + priv->child_up, dict); } unsigned int |