diff options
| author | vmallika <vmallika@redhat.com> | 2015-06-25 14:58:50 +0530 |
|---|---|---|
| committer | Raghavendra G <rgowdapp@redhat.com> | 2015-07-02 04:26:44 -0700 |
| commit | 2bf6e683e88517c1b2c6c8b13ab681bfdb0acacc (patch) | |
| tree | d172ba7efdc2f913de3bda4d61bd0b261f2c4fcc /xlators/features/marker | |
| parent | 12c854b7a28a8d764f0446d2e0133c447c2537c2 (diff) | |
quota: marker accounting goes bad with rename while writing a file
This is a backport of http://review.gluster.org/#/c/11403/
> With below test-case, marker accounting becomes bad:
> 1) Create a volume with 1 brick
> 2) fuse mount
> 3) on one terminal write some data
> dd if=/dev/zero of=f1 bs=1M count=500 oflag=sync
> 4) on another terminal execute below rename operation while the write is
> still in progress
> for i in {1..50}; do
> ii=`expr $i + 1`;
> mv f$i f$ii;
> done
>
> remove-xattr is already on while doing rename operation,
> we should not be doing again in background when reducing the
> parent size.
>
> Change-Id: I969a64bb559e2341315928b55b99203e9ddee3f2
> BUG: 1235195
> Signed-off-by: vmallika <vmallika@redhat.com>
> Reviewed-on: http://review.gluster.org/11403
> Tested-by: NetBSD Build System <jenkins@build.gluster.org>
> Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
> Tested-by: Gluster Build System <jenkins@build.gluster.com>
> Tested-by: Raghavendra G <rgowdapp@redhat.com>
Change-Id: Ic37c7f7bd74093ee7e155b305834dbc1fdd24b10
BUG: 1235990
Signed-off-by: vmallika <vmallika@redhat.com>
Reviewed-on: http://review.gluster.org/11425
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'xlators/features/marker')
| -rw-r--r-- | xlators/features/marker/src/marker-quota.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/xlators/features/marker/src/marker-quota.c b/xlators/features/marker/src/marker-quota.c index bbe2d9d0af1..0b015ef8040 100644 --- a/xlators/features/marker/src/marker-quota.c +++ b/xlators/features/marker/src/marker-quota.c @@ -2585,11 +2585,15 @@ out: int32_t mq_remove_contri (xlator_t *this, loc_t *loc, quota_inode_ctx_t *ctx, - inode_contribution_t *contri, quota_meta_t *delta) + inode_contribution_t *contri, quota_meta_t *delta, + gf_boolean_t remove_xattr) { int32_t ret = -1; char contri_key[CONTRI_KEY_MAX] = {0, }; + if (remove_xattr == _gf_false) + goto done; + GET_CONTRI_KEY (contri_key, contri->gfid, ret); if (ret < 0) { gf_log (this->name, GF_LOG_ERROR, "get contri_key " @@ -2615,6 +2619,7 @@ mq_remove_contri (xlator_t *this, loc_t *loc, quota_inode_ctx_t *ctx, } } +done: LOCK (&contri->lock); { contri->contribution += delta->size; @@ -3042,6 +3047,7 @@ mq_reduce_parent_size_task (void *opaque) xlator_t *this = NULL; loc_t *loc = NULL; int64_t contri = 0; + gf_boolean_t remove_xattr = _gf_true; GF_ASSERT (opaque); @@ -3068,7 +3074,11 @@ mq_reduce_parent_size_task (void *opaque) } if (contri >= 0) { - /* contri paramater is supplied only for rename operation */ + /* contri paramater is supplied only for rename operation. + * remove xattr is alreday performed, we need to skip + * removexattr for rename operation + */ + remove_xattr = _gf_false; delta.size = contri; delta.file_count = 1; delta.dir_count = 0; @@ -3122,7 +3132,8 @@ mq_reduce_parent_size_task (void *opaque) mq_sub_meta (&delta, NULL); - ret = mq_remove_contri (this, loc, ctx, contribution, &delta); + ret = mq_remove_contri (this, loc, ctx, contribution, &delta, + remove_xattr); if (ret < 0) goto out; |