summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/afr/src
diff options
context:
space:
mode:
authorPranith Kumar K <pkarampu@redhat.com>2014-11-06 10:37:06 +0530
committerVijay Bellur <vbellur@redhat.com>2014-11-11 03:33:41 -0800
commitffa4263c2f8fcb95ed5553a5a114bc26a920ad27 (patch)
treefc07cd3bb16416e5e2cb0736d0ff5ab12ba4bf47 /xlators/cluster/afr/src
parent98f82412986339626bcd1218ff1da0fbb2664d6d (diff)
features/marker: Filter internal xattrs in lookup
Afr should ignore quota-size-key as part of self-heal but should heal quota-limit key. Change-Id: Ic0b06bd20a563a00d6bfdc2dc5a76c661e533ecb BUG: 1161106 Signed-off-by: Pranith Kumar K <pkarampu@redhat.com> Reviewed-on: http://review.gluster.org/9061 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Raghavendra G <rgowdapp@redhat.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/cluster/afr/src')
-rw-r--r--xlators/cluster/afr/src/afr-common.c6
-rw-r--r--xlators/cluster/afr/src/afr-self-heal-metadata.c19
-rw-r--r--xlators/cluster/afr/src/afr.h3
3 files changed, 21 insertions, 7 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index 42ff70937ac..1527a47f716 100644
--- a/xlators/cluster/afr/src/afr-common.c
+++ b/xlators/cluster/afr/src/afr-common.c
@@ -1156,8 +1156,8 @@ static char *afr_ignore_xattrs[] = {
NULL
};
-static gf_boolean_t
-afr_lookup_xattr_ignorable (char *key)
+gf_boolean_t
+afr_is_xattr_ignorable (char *key)
{
int i = 0;
@@ -1176,7 +1176,7 @@ xattr_is_equal (dict_t *this, char *key1, data_t *value1, void *data)
dict_t *xattr2 = (dict_t *)data;
data_t *value2 = NULL;
- if (afr_lookup_xattr_ignorable (key1))
+ if (afr_is_xattr_ignorable (key1))
return 0;
value2 = dict_get (xattr2, key1);
diff --git a/xlators/cluster/afr/src/afr-self-heal-metadata.c b/xlators/cluster/afr/src/afr-self-heal-metadata.c
index 96b3262e471..dced4d07df6 100644
--- a/xlators/cluster/afr/src/afr-self-heal-metadata.c
+++ b/xlators/cluster/afr/src/afr-self-heal-metadata.c
@@ -20,6 +20,19 @@
#define AFR_HEAL_ATTR (GF_SET_ATTR_UID|GF_SET_ATTR_GID|GF_SET_ATTR_MODE)
+static gf_boolean_t
+_afr_ignorable_key_match (dict_t *d, char *k, data_t *val, void *mdata)
+{
+ return afr_is_xattr_ignorable (k);
+}
+
+void
+afr_delete_ignorable_xattrs (dict_t *xattr)
+{
+ dict_foreach_match (xattr, _afr_ignorable_key_match, NULL,
+ dict_remove_foreach_fn, NULL);
+}
+
int
__afr_selfheal_metadata_do (call_frame_t *frame, xlator_t *this, inode_t *inode,
int source, unsigned char *healed_sinks,
@@ -46,8 +59,7 @@ __afr_selfheal_metadata_do (call_frame_t *frame, xlator_t *this, inode_t *inode,
goto out;
}
- afr_filter_xattrs (xattr);
- dict_del (xattr, GF_SELINUX_XATTR_KEY);
+ afr_delete_ignorable_xattrs (xattr);
for (i = 0; i < priv->child_count; i++) {
if (old_xattr) {
@@ -66,8 +78,7 @@ __afr_selfheal_metadata_do (call_frame_t *frame, xlator_t *this, inode_t *inode,
ret = syncop_getxattr (priv->children[i], &loc, &old_xattr, 0);
if (old_xattr) {
- dict_del (old_xattr, GF_SELINUX_XATTR_KEY);
- afr_filter_xattrs (old_xattr);
+ afr_delete_ignorable_xattrs (old_xattr);
ret = syncop_removexattr (priv->children[i], &loc, "",
old_xattr);
}
diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h
index 2b0ced58f6c..51e57e8207f 100644
--- a/xlators/cluster/afr/src/afr.h
+++ b/xlators/cluster/afr/src/afr.h
@@ -1008,4 +1008,7 @@ afr_replies_wipe (struct afr_reply *replies, int count);
gf_boolean_t
afr_xattrs_are_equal (dict_t *dict1, dict_t *dict2);
+
+gf_boolean_t
+afr_is_xattr_ignorable (char *key);
#endif /* __AFR_H__ */