diff options
| author | Shehjar Tikoo <shehjart@gluster.com> | 2010-11-25 04:11:09 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2010-11-25 06:35:26 -0800 |
| commit | 6623055696e1b28267305ac45087497f4c6a884a (patch) | |
| tree | 83136152f1d77a062f30322b5feda4bf857e32a8 /xlators/nfs/server/src/nfs.c | |
| parent | 26a8202550593232f941cd2251cfbeb304991808 (diff) | |
nfs: Export subvolumes on per-subvolume CHILD-UP
..so that nfs clients can mount an UP subvolume even if other subvolumes
havent come up yet.
This was a problem because nfs was waiting for all children to receive
CHILD-UP before exporting any subvolume.
Signed-off-by: Shehjar Tikoo <shehjart@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 2093 (volumes cannot start when one node in a replicated setup is down)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2093
Diffstat (limited to 'xlators/nfs/server/src/nfs.c')
| -rw-r--r-- | xlators/nfs/server/src/nfs.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/xlators/nfs/server/src/nfs.c b/xlators/nfs/server/src/nfs.c index 5f116a3b76d..001df8eeb9a 100644 --- a/xlators/nfs/server/src/nfs.c +++ b/xlators/nfs/server/src/nfs.c @@ -639,6 +639,13 @@ init (xlator_t *this) { goto err; } + ret = nfs_init_versions (nfs, this); + if (ret == -1) { + gf_log (GF_NFS, GF_LOG_CRITICAL, "Failed to initialize " + "protocols"); + goto err; + } + ret = 0; err: if (ret == 0) @@ -653,7 +660,6 @@ notify (xlator_t *this, int32_t event, void *data, ...) { struct nfs_state *nfs = NULL; xlator_t *subvol = NULL; - int ret = -1; nfs = (struct nfs_state *)this->private; subvol = (xlator_t *)data; @@ -662,21 +668,9 @@ notify (xlator_t *this, int32_t event, void *data, ...) event); switch (event) { - case GF_EVENT_CHILD_CONNECTING: case GF_EVENT_CHILD_UP: { nfs_startup_subvolume (this, subvol); - if ((nfs->upsubvols == nfs->allsubvols) && - (!nfs->subvols_started)) { - nfs->subvols_started = 1; - gf_log (GF_NFS, GF_LOG_TRACE, "All children up," - " starting RPC"); - ret = nfs_init_versions (nfs, this); - if (ret == -1) - gf_log (GF_NFS, GF_LOG_CRITICAL, - "Failed to initialize " - "protocols"); - } break; } |