diff options
| author | Raghavendra G <rgowdapp@redhat.com> | 2017-09-18 16:01:34 +0530 |
|---|---|---|
| committer | jiffin tony Thottan <jthottan@redhat.com> | 2017-12-08 05:36:52 +0000 |
| commit | fd3448c4a70c0c4ed2b8053ebe5bbe4d261086ee (patch) | |
| tree | 34277997dcc3841ff6dedcae2f00cd3884c6f03c | |
| parent | f85154306277fbd0510109dc67c9a85e67223028 (diff) | |
cluster/dht: don't overfill the buffer in readdir(p)
Superflous dentries that cannot be fit in the buffer size provided by
kernel are thrown away by fuse-bridge. This means,
* the next readdir(p) seen by readdir-ahead would have an offset of a
dentry returned in a previous readdir(p) response. When readdir-ahead
detects non-monotonic offset it turns itself off which can result in
poor readdir performance.
* readdirp can be cpu-intensive on brick and there is no point to read
all those dentries just to be thrown away by fuse-bridge.
So, the best strategy would be to fill the buffer optimally - neither
overfill nor underfill.
> Change-Id: Idb3d85dd4c08fdc4526b2df801d49e69e439ba84
> BUG: 1492625
> Signed-off-by: Raghavendra G <rgowdapp@redhat.com>
(cherry picked from commit e785faead91f74dce7c832848f2e8f3f43bd0be5)
Change-Id: Idb3d85dd4c08fdc4526b2df801d49e69e439ba84
BUG: 1478411
Signed-off-by: Raghavendra G <rgowdapp@redhat.com>
| -rw-r--r-- | xlators/cluster/dht/src/dht-common.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index ad9a52b6261..79d3cfb976c 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -5288,6 +5288,13 @@ list: } done: + if ((op_ret == 0) && op_errno != ENOENT) { + /* remaining buffer size is not enough to hold even one + * dentry + */ + goto unwind; + } + if ((count == 0) || (local && (local->filled < local->size))) { if ((next_offset == 0) || (op_errno == ENOENT)) { next_offset = 0; @@ -5318,8 +5325,8 @@ done: STACK_WIND_COOKIE (frame, dht_readdirp_cbk, next_subvol, next_subvol, next_subvol->fops->readdirp, - local->fd, local->size, next_offset, - local->xattr); + local->fd, (local->size - local->filled), + next_offset, local->xattr); return 0; } @@ -5409,6 +5416,13 @@ dht_readdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, } done: + if ((op_ret == 0) && op_errno != ENOENT) { + /* remaining buffer size is not enough to hold even one + * dentry + */ + goto unwind; + } + if ((count == 0) || (local && (local->filled < local->size))) { if ((op_ret <= 0) || (op_errno == ENOENT)) { next_subvol = dht_subvol_next (this, prev); @@ -5422,7 +5436,8 @@ done: STACK_WIND_COOKIE (frame, dht_readdir_cbk, next_subvol, next_subvol, next_subvol->fops->readdir, - local->fd, local->size, next_offset, NULL); + local->fd, (local->size - local->filled), + next_offset, NULL); return 0; } |