summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd
diff options
context:
space:
mode:
authorCsaba Henk <csaba@gluster.com>2011-04-12 02:47:45 +0000
committerAnand Avati <avati@gluster.com>2011-04-12 21:49:52 -0700
commit59b9ab45a01d52e197ab6f76fd71e64910396d57 (patch)
tree640b5bc733193931331742b22f10c6d85efbf245 /xlators/mgmt/glusterd
parent1b18a7d64574ca08b937113fcb19b9d851abd43c (diff)
temporary workaround for mtab update race thingy
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, 3 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index cdf9973aa77..8d1cd639f3d 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -4143,6 +4143,7 @@ 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 fec0a1b2e19..59d4963d42b 100644
--- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c
+++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
@@ -339,6 +339,7 @@ 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);
@@ -577,6 +578,7 @@ 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 "