diff options
author | Emmanuel Dreyfus <manu@netbsd.org> | 2014-09-21 13:57:47 +0200 |
---|---|---|
committer | Vijay Bellur <vbellur@redhat.com> | 2014-10-03 07:57:47 -0700 |
commit | 473c34f895c49bf2bd327ece586d3613cd86c068 (patch) | |
tree | 0facfd50720f62b298530a73bc0b55ffc5823ee8 /xlators/mgmt/glusterd/src/glusterd-volume-ops.c | |
parent | baa6f0ad759af024e4731a0f3889fe857ae2f1bf (diff) |
Do not hardcode umount(8) path, emulate lazy umount
1) Use a system-dependent macro for umount(8) location instead of
relying on $PATH to find it, for security and portability sake.
2) Introduce gf_umount_lazy() to replace umount -l (-l for lazy) invocations,
which is only supported on Linux; On Linux behavior in unchanged. On other
systems, we fork an external process (umountd) that will take care of
periodically attempt to unmount, and optionally rmdir.
BUG: 1129939
Change-Id: Ia91167c0652f8ddab85136324b08f87c5ac1e51d
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/8649
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Csaba Henk <csaba@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-volume-ops.c')
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-ops.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c index cde4bec844d..4685fa6a8e4 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c @@ -2241,7 +2241,6 @@ glusterd_stop_volume (glusterd_volinfo_t *volinfo) int ret = -1; glusterd_brickinfo_t *brickinfo = NULL; char mountdir[PATH_MAX] = {0,}; - runner_t runner = {0,}; char pidfile[PATH_MAX] = {0,}; xlator_t *this = NULL; @@ -2278,19 +2277,11 @@ glusterd_stop_volume (glusterd_volinfo_t *volinfo) GLUSTERD_GET_QUOTA_AUX_MOUNT_PATH (mountdir, volinfo->volname, "/"); - runinit (&runner); - runner_add_args (&runner, "umount", - - #if GF_LINUX_HOST_OS - "-l", - #endif - mountdir, NULL); - ret = runner_run_reuse (&runner); + ret = gf_umount_lazy (this->name, mountdir, 0); if (ret) - gf_log (this->name, GF_LOG_ERROR, "umount on %s failed, " - "reason : %s", mountdir, strerror (errno)); - - runner_end (&runner); + gf_log (this->name, GF_LOG_ERROR, + "umount on %s failed, reason : %s", + mountdir, strerror (errno)); } ret = glusterd_handle_snapd_option (volinfo); @@ -2496,7 +2487,7 @@ glusterd_clearlocks_unmount (glusterd_volinfo_t *volinfo, char *mntpt) * stat() on mount can be due to network failures.*/ runinit (&runner); - runner_add_args (&runner, "/bin/umount", "-f", NULL); + runner_add_args (&runner, _PATH_UMOUNT, "-f", NULL); runner_argprintf (&runner, "%s", mntpt); synclock_unlock (&priv->big_lock); |