diff options
| author | vmallika <vmallika@redhat.com> | 2015-07-08 22:22:50 +0530 |
|---|---|---|
| committer | Raghavendra G <rgowdapp@redhat.com> | 2015-07-10 01:20:44 -0700 |
| commit | c2cd3aeb0d88117f0929a733e9b05aa3e4d392ac (patch) | |
| tree | 613031a50893c46daa68147e2c114637d8f16059 /libglusterfs/src | |
| parent | 7f9108fc0a5c9543e18ad52759a3ebdf91900a33 (diff) | |
quota/marker: fix spurious failure afr-quota-xattr-mdata-heal.t
During quota-update process if inode info is present in size-xattr and
missing in contri-xattrs, then in function '_mq_get_metadata', we set
contri-size as zero (on error -2, which means usage info present, but inode info missing).
With this we are calculating wrong delta and updating the same.
With this patch we are ignoring errors if inode info in xattrs are missing
Change-Id: I7940a0e299b8bb425b5b43746b1f13f775c7fb92
BUG: 1241153
Signed-off-by: vmallika <vmallika@redhat.com>
Reviewed-on: http://review.gluster.org/11583
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Tested-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'libglusterfs/src')
| -rw-r--r-- | libglusterfs/src/quota-common-utils.c | 14 | ||||
| -rw-r--r-- | libglusterfs/src/quota-common-utils.h | 3 |
2 files changed, 16 insertions, 1 deletions
diff --git a/libglusterfs/src/quota-common-utils.c b/libglusterfs/src/quota-common-utils.c index 8c528c8bd3b..0c93303a5ae 100644 --- a/libglusterfs/src/quota-common-utils.c +++ b/libglusterfs/src/quota-common-utils.c @@ -57,7 +57,7 @@ out: } int32_t -quota_dict_get_meta (dict_t *dict, char *key, quota_meta_t *meta) +quota_dict_get_inode_meta (dict_t *dict, char *key, quota_meta_t *meta) { int32_t ret = -1; data_t *data = NULL; @@ -77,6 +77,18 @@ out: } int32_t +quota_dict_get_meta (dict_t *dict, char *key, quota_meta_t *meta) +{ + int32_t ret = -1; + + ret = quota_dict_get_inode_meta (dict, key, meta); + if (ret == -2) + ret = 0; + + return ret; +} + +int32_t quota_dict_set_meta (dict_t *dict, char *key, const quota_meta_t *meta, ia_type_t ia_type) { diff --git a/libglusterfs/src/quota-common-utils.h b/libglusterfs/src/quota-common-utils.h index 2c3632b903c..c930db8e86c 100644 --- a/libglusterfs/src/quota-common-utils.h +++ b/libglusterfs/src/quota-common-utils.h @@ -41,6 +41,9 @@ int32_t quota_data_to_meta (data_t *data, char *key, quota_meta_t *meta); int32_t +quota_dict_get_inode_meta (dict_t *dict, char *key, quota_meta_t *meta); + +int32_t quota_dict_get_meta (dict_t *dict, char *key, quota_meta_t *meta); int32_t |