diff options
| author | Shehjar Tikoo <shehjart@gluster.com> | 2010-02-25 15:38:03 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2010-03-04 03:13:13 -0800 |
| commit | 0a86bd1aa3004a9f27e59eb08f8facf312234737 (patch) | |
| tree | a0df26d4e37e72dcbb9d42cca860ab554ea10821 /xlators/cluster/dht/src/dht-common.c | |
| parent | 59947fc4c28a0310d76a663d2440c08b762ed3fd (diff) | |
distribute: Respect end-of-dir on readdir only for last subvol
We need to ensure that only the last subvolume's end-of-directory
notification is respected so that directory reading does not stop
before all subvolumes have been read. That could happen because the
posix for each subvolume sends a ENOENT on end-of-directory but in
distribute we're not concerned only with a posix's view of the
directory but the aggregated namespace' view of the directory,
which is maintained by distribute.
Signed-off-by: Shehjar Tikoo <shehjart@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 597 (miscellaneous fixes for xlators to work well with NFS xlator)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=597
Diffstat (limited to 'xlators/cluster/dht/src/dht-common.c')
| -rw-r--r-- | xlators/cluster/dht/src/dht-common.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index 523a62429f6..7dcc7205ad0 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -2168,6 +2168,15 @@ dht_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int op_ret, count++; } op_ret = count; + /* We need to ensure that only the last subvolume's end-of-directory + * notification is respected so that directory reading does not stop + * before all subvolumes have been read. That could happen because the + * posix for each subvolume sends a ENOENT on end-of-directory but in + * distribute we're not concerned only with a posix's view of the + * directory but the aggregated namespace' view of the directory. + */ + if (prev->this != dht_last_up_subvol (this)) + op_errno = 0; done: if (count == 0) { @@ -2258,6 +2267,15 @@ dht_readdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, } } op_ret = count; + /* We need to ensure that only the last subvolume's end-of-directory + * notification is respected so that directory reading does not stop + * before all subvolumes have been read. That could happen because the + * posix for each subvolume sends a ENOENT on end-of-directory but in + * distribute we're not concerned only with a posix's view of the + * directory but the aggregated namespace' view of the directory. + */ + if (prev->this != dht_last_up_subvol (this)) + op_errno = 0; done: if (count == 0) { |