From fcb55d54a62c8d4a2e8ce4596cd462c471f74dd3 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Tue, 31 Mar 2015 18:09:25 +0530 Subject: cluster/ec: Ignore volume-mark key for comparing dicts Change-Id: Id60107e9fb96588d24fa2f3be85c764b7f08e3d1 BUG: 1207712 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.org/10077 Tested-by: Gluster Build System Reviewed-by: Xavier Hernandez --- xlators/cluster/ec/src/ec-combine.c | 1 + 1 file changed, 1 insertion(+) (limited to 'xlators/cluster/ec/src') diff --git a/xlators/cluster/ec/src/ec-combine.c b/xlators/cluster/ec/src/ec-combine.c index de9a9951179..5f5d97275be 100644 --- a/xlators/cluster/ec/src/ec-combine.c +++ b/xlators/cluster/ec/src/ec-combine.c @@ -192,6 +192,7 @@ int32_t ec_dict_data_compare(dict_t * dict, char * key, data_t * value, (strncmp(key, EC_QUOTA_PREFIX, strlen(EC_QUOTA_PREFIX)) == 0) || (fnmatch(GF_XATTR_STIME_PATTERN, key, 0) == 0) || (fnmatch(MARKER_XATTR_PREFIX ".*." XTIME, key, 0) == 0) || + (fnmatch(GF_XATTR_MARKER_KEY ".*", key, 0) == 0) || (XATTR_IS_NODE_UUID(key))) { return 0; -- cgit