diff options
| -rw-r--r-- | tests/include.rc | 1 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-common.c | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tests/include.rc b/tests/include.rc index e40cc461c9b..01da6041c65 100644 --- a/tests/include.rc +++ b/tests/include.rc @@ -14,6 +14,7 @@ NFS_EXPORT_TIMEOUT=20 UMOUNT_TIMEOUT=5 PROCESS_UP_TIMEOUT=20 REBALANCE_TIMEOUT=120 +HEAL_TIMEOUT=120 mkdir -p $B0; mkdir -p $M0 $M1; diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index 7cfe7665114..fae3d4c1731 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -1775,6 +1775,7 @@ static char *afr_ignore_xattrs[] = { GLUSTERFS_ENTRYLK_COUNT, GLUSTERFS_INODELK_COUNT, GF_SELINUX_XATTR_KEY, + QUOTA_SIZE_KEY, NULL }; @@ -1829,12 +1830,15 @@ afr_lookup_xattrs_are_equal (dict_t **xattr, int32_t *success_children, int succ child1 = success_children[0]; for (i = 1; i < success_count; i++) { child2 = success_children[i]; - if (xattr[child1]->count != xattr[child2]->count) - return _gf_false; ret = dict_foreach (xattr[child1], xattr_is_equal, (void*) xattr[child2]); if (ret == -1) return _gf_false; + + ret = dict_foreach (xattr[child2], xattr_is_equal, + (void*) xattr[child1]); + if (ret == -1) + return _gf_false; } return _gf_true; |