summaryrefslogtreecommitdiffstats
path: root/xlators/features/quota
diff options
context:
space:
mode:
authorvmallika <vmallika@redhat.com>2015-12-28 17:33:26 +0530
committerRaghavendra G <rgowdapp@redhat.com>2016-01-25 22:26:29 -0800
commitd93ed64f65f7680cb25068cfae1844de44ca39b7 (patch)
tree408ab743d137f5611ab46e3f269bcd6ef9b7de81 /xlators/features/quota
parent195548f55b09bf71db92929b7b734407b863093c (diff)
quota: limit xattr for subdir not healed on newly added bricks
This is a backport of http://review.gluster.org/#/c/13100/ DHT after creating missing directory, tries to heal the xattrs. This xattrs operation fails as INTERNAL FOP key was not set > Change-Id: I819d373cf7073da014143d9ada908228ddcd140c > BUG: 1294479 > Signed-off-by: vmallika <vmallika@redhat.com> Change-Id: I30345e919bc9ae882fd0e159c7b03ffc50ed5ef7 BUG: 1294608 Signed-off-by: vmallika <vmallika@redhat.com> Reviewed-on: http://review.gluster.org/13108 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com> Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com> Reviewed-by: Raghavendra G <rgowdapp@redhat.com> Tested-by: Raghavendra G <rgowdapp@redhat.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Smoke: Gluster Build System <jenkins@build.gluster.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators/features/quota')
-rw-r--r--xlators/features/quota/src/quota.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/xlators/features/quota/src/quota.c b/xlators/features/quota/src/quota.c
index b65956b..8b98371 100644
--- a/xlators/features/quota/src/quota.c
+++ b/xlators/features/quota/src/quota.c
@@ -3979,14 +3979,15 @@ int
quota_setxattr (call_frame_t *frame, xlator_t *this,
loc_t *loc, dict_t *dict, int flags, dict_t *xdata)
{
- quota_priv_t *priv = NULL;
+ quota_priv_t *priv = NULL;
int op_errno = EINVAL;
int op_ret = -1;
int64_t hard_lim = -1;
int64_t soft_lim = -1;
int64_t object_hard_limit = -1;
int64_t object_soft_limit = -1;
- quota_local_t *local = NULL;
+ quota_local_t *local = NULL;
+ gf_boolean_t internal_fop = _gf_false;
priv = this->private;
@@ -3996,7 +3997,10 @@ quota_setxattr (call_frame_t *frame, xlator_t *this,
VALIDATE_OR_GOTO (this, err);
VALIDATE_OR_GOTO (loc, err);
- if (frame->root->pid >= 0) {
+ if (xdata && dict_get (xdata, GLUSTERFS_INTERNAL_FOP_KEY))
+ internal_fop = _gf_true;
+
+ if (frame->root->pid >= 0 && internal_fop == _gf_false) {
GF_IF_INTERNAL_XATTR_GOTO ("trusted.glusterfs.quota*", dict,
op_errno, err);
GF_IF_INTERNAL_XATTR_GOTO ("trusted.pgfid*", dict, op_errno,