summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd
diff options
context:
space:
mode:
authorCsaba Henk <csaba@gluster.com>2011-05-26 03:32:24 +0000
committerAnand Avati <avati@gluster.com>2011-05-26 08:55:10 -0700
commit6ff690a54ea7d26089be29470e499292971dd30e (patch)
treef07a9aee5cad0c38e2b6848ed5e8ecc9da8d9ab4 /xlators/mgmt/glusterd
parent19b08a3b627cb8a7f74fc608bfcaddc4e063aa6f (diff)
Revert "temporary workaround for mtab update race thingy"
This reverts commit 59b9ab45a01d52e197ab6f76fd71e64910396d57. [c5d781e0 made this temporary workaround unnecessary] Conflicts: xlators/features/marker/utils/syncdaemon/resource.py Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2690 (race between mtab updates of mount and umount) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2690
Diffstat (limited to 'xlators/mgmt/glusterd')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-op-sm.c1
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-rebalance.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index e61d294c815..e7ed6d53eb5 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -4850,7 +4850,6 @@ glusterd_quota_child_waitpid (void *arg)
child_info = (glusterd_quota_child_info_t *)arg;
#ifdef GF_LINUX_HOST_OS
- usleep (200000);
snprintf (cmd, sizeof (cmd), "umount -l %s",
child_info->mountdir);
system (cmd);
diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
index 59d4963d42b..fec0a1b2e19 100644
--- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c
+++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
@@ -339,7 +339,6 @@ out:
gf_log ("rebalance", GF_LOG_INFO, "rebalance on %s complete",
defrag->mount);
- usleep (200000);
snprintf (cmd_str, 1024, "umount -l %s", defrag->mount);
ret = system (cmd_str);
LOCK_DESTROY (&defrag->lock);
@@ -578,7 +577,6 @@ glusterd_handle_defrag_start (glusterd_volinfo_t *volinfo, char *op_errstr,
ret = pthread_create (&defrag->th, NULL, glusterd_defrag_start,
volinfo);
if (ret) {
- usleep (200000);
snprintf (cmd_str, sizeof (cmd_str), "umount -l %s", defrag->mount);
if (system (cmd_str))
gf_log("glusterd", GF_LOG_DEBUG, "command: %s "