summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorRaghavendra G <raghavendra@gluster.com>2011-06-30 23:01:41 +0000
committerAnand Avati <avati@gluster.com>2011-07-01 01:26:47 -0700
commitd72a01fb6ba90f92217bde2ab89da23a1b1e07ab (patch)
tree9e20ef8a0492531d903350d8bdadf3a5d885b311 /xlators
parent1bf2c9f798dc1e11aba63b39e6e604e62f1bc1c3 (diff)
mount/fuse: wait till CHILD_UP event is recieved to do the first lookup.
Signed-off-by: Raghavendra G <raghavendra@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 3091 (rebalance fails with "transport endpoint not connected" in 3.2.1 rdma set-up) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=3091
Diffstat (limited to 'xlators')
-rw-r--r--xlators/mount/fuse/src/fuse-bridge.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c
index ad2a706..662e5ad 100644
--- a/xlators/mount/fuse/src/fuse-bridge.c
+++ b/xlators/mount/fuse/src/fuse-bridge.c
@@ -3026,8 +3026,6 @@ fuse_graph_sync (xlator_t *this)
{
fuse_private_t *priv = NULL;
int need_first_lookup = 0;
- struct timeval now = {0, };
- struct timespec timeout = {0, };
int ret = 0;
priv = this->private;
@@ -3041,14 +3039,9 @@ fuse_graph_sync (xlator_t *this)
priv->next_graph = NULL;
need_first_lookup = 1;
- gettimeofday (&now, NULL);
- timeout.tv_sec = now.tv_sec + MAX_FUSE_PROC_DELAY;
- timeout.tv_nsec = now.tv_usec * 1000;
-
while (!priv->child_up) {
- ret = pthread_cond_timedwait (&priv->sync_cond,
- &priv->sync_mutex,
- &timeout);
+ ret = pthread_cond_wait (&priv->sync_cond,
+ &priv->sync_mutex);
if (ret != 0) {
gf_log (this->name, GF_LOG_DEBUG,
"timedwait returned non zero value "