diff options
author | Krutika Dhananjay <kdhananj@redhat.com> | 2015-03-17 16:43:00 +0530 |
---|---|---|
committer | Niels de Vos <ndevos@redhat.com> | 2015-03-18 04:21:28 -0700 |
commit | 077185afe35350aae03bac0d25fbebcd8a3e1c72 (patch) | |
tree | c9ccc6022ec8e6d653ce619751c82e56b5d18e7a /xlators/cluster/afr/src/afr-dir-read.c | |
parent | 147b3871180a699a642767d0cc0ea00fa69a33c8 (diff) |
cluster/afr: Make read child match check in afr optionalv3.5.4beta1
Backport of: http://review.gluster.org/#/c/9917
Having this particular check which was introduced by
commit bb2df4e63fa8a5d65f18b4a5efc757e8d475fbff causes a drop in
performance in readdirp. So the behavior is made configurable with this
patch.
Change-Id: I9012a6bb955229a0cbb48f06e4e2edc0782dfead
BUG: 1202675
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-on: http://review.gluster.org/9924
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'xlators/cluster/afr/src/afr-dir-read.c')
-rw-r--r-- | xlators/cluster/afr/src/afr-dir-read.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/xlators/cluster/afr/src/afr-dir-read.c b/xlators/cluster/afr/src/afr-dir-read.c index d94cb0ca699..2d368a49544 100644 --- a/xlators/cluster/afr/src/afr-dir-read.c +++ b/xlators/cluster/afr/src/afr-dir-read.c @@ -422,11 +422,14 @@ afr_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno, gf_dirent_t *entries, dict_t *xdata) { + afr_private_t *priv = NULL; afr_local_t *local = NULL; gf_dirent_t *entry = NULL; int par_read_child = (long) cookie; int32_t read_child = -1; + priv = this->private; + if (op_ret == -1) goto out; @@ -434,6 +437,9 @@ afr_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this, afr_readdir_filter_trash_dir (entries, local->fd); + if (!priv->consistent_metadata) + goto out; + list_for_each_entry (entry, &entries->list, list) { if (entry->inode) { read_child = -1; |