diff options
| author | vmallika <vmallika@redhat.com> | 2016-03-30 20:16:32 +0530 |
|---|---|---|
| committer | Raghavendra G <rgowdapp@redhat.com> | 2016-04-06 01:24:00 -0700 |
| commit | 45ea3bce3068fa2c846e8c11e069fff9eacf8532 (patch) | |
| tree | 7f4eff473b284d8b89041832d1a1eec3e8ce9f57 /xlators/features/quota/src | |
| parent | c6d2f61d1aadfe7f93ec0da66b1b23c7f96d09dc (diff) | |
marker: build_ancestry in marker
This is a backport of http://review.gluster.org/#/c/13857/
* quota-enforcer doesn't execute build_ancestry in the below
code path
1) Special client (PID < 0)
2) unlink
3) rename within the same directory
4) link within the same directory
In these cases, marker accounting can fail as parent not found.
We need to build_ancestry in marker if it doesn't find parent
during update txn
> Change-Id: Idb7a2906500647baa6d183ba859b15e34769029c
> BUG: 1320818
> Signed-off-by: vmallika <vmallika@redhat.com>
Change-Id: Ib56a556bdeebcc498d59599baf4655be05d765e5
BUG: 1324040
Signed-off-by: vmallika <vmallika@redhat.com>
Reviewed-on: http://review.gluster.org/13907
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'xlators/features/quota/src')
| -rw-r--r-- | xlators/features/quota/src/quota.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xlators/features/quota/src/quota.c b/xlators/features/quota/src/quota.c index aaf9cf89d6b..3dcb021685c 100644 --- a/xlators/features/quota/src/quota.c +++ b/xlators/features/quota/src/quota.c @@ -825,7 +825,10 @@ quota_build_ancestry_cbk (call_frame_t *frame, void *cookie, xlator_t *this, break; } - GF_ASSERT (&entry->list != &entries->list); + /* Getting assertion here, need to investigate + comment for now + GF_ASSERT (&entry->list != &entries->list); + */ quota_add_parent (&parents, entry->d_name, parent->gfid); } |