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 /xlators/features/marker/src/marker-quota.c | |
| 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 'xlators/features/marker/src/marker-quota.c')
| -rw-r--r-- | xlators/features/marker/src/marker-quota.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/xlators/features/marker/src/marker-quota.c b/xlators/features/marker/src/marker-quota.c index 00488c8407a..a5ef0bb2321 100644 --- a/xlators/features/marker/src/marker-quota.c +++ b/xlators/features/marker/src/marker-quota.c @@ -2090,9 +2090,9 @@ _quota_dict_get_meta (xlator_t *this, dict_t *dict, char *key, priv = this->private; - ret = quota_dict_get_meta (dict, key, meta); + ret = quota_dict_get_inode_meta (dict, key, meta); if (ret == -2 && (priv->feature_enabled & GF_INODE_QUOTA) == 0) { - /* quota_dict_get_meta returns -2 if + /* quota_dict_get_inode_meta returns -2 if * inode quota xattrs are not present. * if inode quota self heal is turned off, * then we should skip healing inode quotas @@ -2461,9 +2461,8 @@ _mq_get_metadata (xlator_t *this, loc_t *loc, quota_meta_t *contri, if (size) { if (loc->inode->ia_type == IA_IFDIR) { - ret = _quota_dict_get_meta (this, rsp_dict, - QUOTA_SIZE_KEY, &meta, - IA_IFDIR, _gf_true); + ret = quota_dict_get_meta (rsp_dict, QUOTA_SIZE_KEY, + &meta); if (ret < 0) { gf_log (this->name, GF_LOG_ERROR, "dict_get failed."); @@ -2481,8 +2480,7 @@ _mq_get_metadata (xlator_t *this, loc_t *loc, quota_meta_t *contri, } if (contri && !loc_is_root(loc)) { - ret = _quota_dict_get_meta (this, rsp_dict, contri_key, &meta, - loc->inode->ia_type, _gf_false); + ret = quota_dict_get_meta (rsp_dict, contri_key, &meta); if (ret < 0) { contri->size = 0; contri->file_count = 0; |