summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunaid <junaid@gluster.com>2011-04-11 11:32:39 +0000
committerAnand Avati <avati@gluster.com>2011-04-11 11:26:50 -0700
commit902478bf9e2e1fee15ef979020d28d2095211e93 (patch)
treeecc2c8ca52145922cafda236a6fea29e7e54a165
parentdff1a8bd5bcd392826561c93058f8a52606a2832 (diff)
mgmt/glusterd: Quota client lazy umount.v3.2.0qa11
Signed-off-by: Junaid <junaid@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2560 (Lazy umount should be done for the maintainance mode mountpoint) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2560
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-op-sm.c109
1 files changed, 77 insertions, 32 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index 644c607..d36bd13 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -51,7 +51,7 @@
#include <sys/types.h>
#include <signal.h>
-
+#include <sys/wait.h>
#define glusterd_op_start_volume_args_get(dict, volname, flags) \
glusterd_op_stop_volume_args_get (dict, volname, flags)
@@ -108,6 +108,11 @@ static char *gsync_opname[] = {
NULL
};
+typedef struct glusterd_quota_child_info {
+ pid_t pid;
+ char mountdir [15];
+} glusterd_quota_child_info_t;
+
static int
glusterd_restart_brick_servers (glusterd_volinfo_t *);
@@ -4125,61 +4130,101 @@ out:
return ret;
}
-void *
-glusterd_quota_start_crawl (void *data)
+
+static void *
+glusterd_quota_child_waitpid (void *arg)
{
- int32_t ret = 0;
- char cmd_str [1024] = {0, };
- char *mount = NULL;
+ char cmd [PATH_MAX] = {0,};
+ glusterd_quota_child_info_t *child_info = NULL;
- mount = (char *) data;
+ GF_VALIDATE_OR_GOTO ("glusterd", arg, out);
- snprintf (cmd_str, 1024, "find %s", mount);
+ child_info = (glusterd_quota_child_info_t *)arg;
- gf_log ("quota crawl", GF_LOG_INFO, "crawl started");
+#ifdef GF_LINUX_HOST_OS
+ snprintf (cmd, sizeof (cmd), "umount -l %s",
+ child_info->mountdir);
+ system (cmd);
- ret = system (cmd_str);
- if (ret == -1)
- gf_log ("crawl", GF_LOG_ERROR, "quota crawl failed");
+ waitpid (child_info->pid, NULL, 0);
+#else
+ waitpid (child_info->pid, NULL, 0);
+ snprintf (cmd, sizeof (cmd), "umount %s",
+ child_info->mountdir);
+ system (cmd);
+#endif
+ rmdir (child_info->mountdir);
- gf_log ("quota crawl", GF_LOG_INFO, "crawl ended");
+ GF_FREE (child_info);
+out:
return NULL;
}
int32_t
glusterd_quota_initiate_fs_crawl (glusterd_conf_t *priv, char *volname)
{
+ int32_t ret = 0;
pthread_t th;
- int32_t ret = 0;
- char mount [1024] = {0, };
- char cmd_str [1024] = {0, };
-
- snprintf (mount, 1024, "%s/mount/%s",
- priv->workdir, volname);
-
- snprintf (cmd_str, 1024, "mkdir -p %s", mount);
-
- ret = system (cmd_str);
- if (ret == -1) {
- gf_log ("glusterd", GF_LOG_DEBUG, "command: %s failed", cmd_str);
+ pid_t pid;
+ int32_t idx = 0;
+ char mountdir [] = "/tmp/mntXXXXXX";
+ char cmd_str [PATH_MAX + 1024] = {0, };
+ glusterd_quota_child_info_t *child_info = NULL;
+
+ if (mkdtemp (mountdir) == NULL) {
+ gf_log ("glusterd", GF_LOG_DEBUG,
+ "failed to create a temporary mount directory");
+ ret = -1;
goto out;
}
- snprintf (cmd_str, 1024, "%s/sbin/glusterfs -s localhost "
- "--volfile-id %s %s", GFS_PREFIX, volname, mount);
+ snprintf (cmd_str, sizeof (cmd_str), "%s/sbin/glusterfs -s localhost "
+ "--volfile-id %s %s", GFS_PREFIX, volname, mountdir);
- ret = system (cmd_str);
+ ret = gf_system (cmd_str);
if (ret == -1) {
gf_log("glusterd", GF_LOG_DEBUG, "command: %s failed", cmd_str);
goto out;
}
- ret = pthread_create (&th, NULL, glusterd_quota_start_crawl, mount);
- if (ret) {
- snprintf (cmd_str, 1024, "umount -l %s", mount);
- ret = system (cmd_str);
+ if ((pid = fork ()) < 0) {
+ gf_log ("glusterd", GF_LOG_WARNING, "fork from parent failed");
+ ret = -1;
+ goto err;
+ } else if (pid == 0) {//first child
+ chdir (mountdir);
+ /* close all fd's */
+ for (idx = 3; idx < 65536; idx++) {
+ close (idx);
+ }
+
+ execl ("/usr/bin/find", "find", ".", (char *) 0);
+ _exit (0);
+ } else {
+ ret = -1;
+
+ child_info = GF_MALLOC (sizeof (glusterd_quota_child_info_t),
+ gf_common_mt_char);
+ if (child_info == NULL)
+ goto err;
+
+ strcpy (child_info->mountdir, mountdir);
+
+ child_info->pid = pid;
+ pthread_create (&th, NULL, glusterd_quota_child_waitpid, child_info);
+
+ ret = 0;
+
+ goto out;
}
+err:
+ if (ret < 0) {
+ umount (mountdir);
+ if (child_info)
+ GF_FREE (child_info);
+ }
+
out:
return ret;
}