diff options
| author | Csaba Henk <csaba@gluster.com> | 2011-05-26 03:32:24 +0000 |
|---|---|---|
| committer | Anand Avati <avati@gluster.com> | 2011-05-26 08:55:10 -0700 |
| commit | 6ff690a54ea7d26089be29470e499292971dd30e (patch) | |
| tree | f07a9aee5cad0c38e2b6848ed5e8ecc9da8d9ab4 | |
| parent | 19b08a3b627cb8a7f74fc608bfcaddc4e063aa6f (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
| -rw-r--r-- | cli/src/cli-rpc-ops.c | 2 | ||||
| -rw-r--r-- | xlators/features/marker/utils/syncdaemon/resource.py | 1 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.c | 1 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-rebalance.c | 2 |
4 files changed, 0 insertions, 6 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index 83abb865b..24afb66f0 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -1390,9 +1390,7 @@ print_limit_list (char *volname, char *limit_list) unmount: memset (&cmd_str, 0, sizeof (cmd_str)); - #if GF_LINUX_HOST_OS - usleep (200000); snprintf (cmd_str, sizeof (cmd_str), "umount -l %s", mountdir); #else snprintf (cmd_str, sizeof (cmd_str), "umount %s", mountdir); diff --git a/xlators/features/marker/utils/syncdaemon/resource.py b/xlators/features/marker/utils/syncdaemon/resource.py index 800d297ba..1e1364c26 100644 --- a/xlators/features/marker/utils/syncdaemon/resource.py +++ b/xlators/features/marker/utils/syncdaemon/resource.py @@ -365,7 +365,6 @@ class GLUSTER(AbstractUrl, SlaveLocal, SlaveRemote): def connect(self): def umount_l(d): - time.sleep(0.2) # XXX temporary workaround argv = ['umount', '-l', d] return os.spawnvp(os.P_WAIT, argv[0], argv) d = tempfile.mkdtemp(prefix='gsyncd-aux-mount-') diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index e61d294c8..e7ed6d53e 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 59d4963d4..fec0a1b2e 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 " |