summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPranith Kumar K <pranithk@gluster.com>2011-11-10 19:49:43 +0530
committerVijay Bellur <vijay@gluster.com>2011-11-11 01:59:32 -0800
commit8fe39cd4d978ec1bfb57dec0e192f5934122f384 (patch)
tree4f5f0051038931ef5aadf74dfd3f06903d769b15
parent0cb2ac3521468cd37ac9e4a67db6e8b29725cf77 (diff)
cluster/afr: honor the xattr set by data-self-heal
Change-Id: I2b8c3a2d7771463ef94892f2a78fc464aba703ee BUG: 3805 Reviewed-on: http://review.gluster.com/708 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vijay@gluster.com>
-rw-r--r--xlators/cluster/afr/src/afr-common.c4
-rw-r--r--xlators/cluster/afr/src/afr-self-heal-data.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index 31632d7..80e5c04 100644
--- a/xlators/cluster/afr/src/afr-common.c
+++ b/xlators/cluster/afr/src/afr-common.c
@@ -787,7 +787,9 @@ afr_lookup_build_response_params (afr_local_t *local, xlator_t *this)
read_child = afr_read_child (this, local->cont.lookup.inode);
gf_log (this->name, GF_LOG_DEBUG, "Building lookup response from %d",
read_child);
- *xattr = dict_ref (local->cont.lookup.xattrs[read_child]);
+ //honor the xattr set by data-self-heal
+ if (!*xattr)
+ *xattr = dict_ref (local->cont.lookup.xattrs[read_child]);
*buf = local->cont.lookup.bufs[read_child];
*postparent = local->cont.lookup.postparents[read_child];
diff --git a/xlators/cluster/afr/src/afr-self-heal-data.c b/xlators/cluster/afr/src/afr-self-heal-data.c
index d86dc62..a2bc3bb 100644
--- a/xlators/cluster/afr/src/afr-self-heal-data.c
+++ b/xlators/cluster/afr/src/afr-self-heal-data.c
@@ -678,6 +678,7 @@ afr_sh_data_fix (call_frame_t *frame, xlator_t *this)
*/
dict_unref (orig_local->cont.lookup.xattr);
+ orig_local->cont.lookup.xattr = NULL;
if (orig_local->cont.lookup.xattrs)
orig_local->cont.lookup.xattr = dict_ref (orig_local->cont.lookup.xattrs[sh->source]);