summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt
diff options
context:
space:
mode:
authorCsaba Henk <csaba@gluster.com>2011-04-16 13:36:04 +0000
committerAnand Avati <avati@gluster.com>2011-04-17 07:39:02 -0700
commit4ade518a232418ccccc6a7bc3c381022465b6c84 (patch)
tree77437fc1d2d88c46af747915c63613a1ee9cc50e /xlators/mgmt
parentc9d85b6268523f1872dde05f271e16afd0358939 (diff)
glusterd: some cleanups needed for 70adbe7b [refactor gsync_status() ...]
Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2780 (geo-replication operations take too much time to complete) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2780
Diffstat (limited to 'xlators/mgmt')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-op-sm.c30
1 files changed, 16 insertions, 14 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index c217a9e45e8..ea63a98b898 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -1906,7 +1906,14 @@ gsyncd_getpidfile (char *master, char *slave, char *pidfile)
static int
gsync_status_byfd (int fd)
{
- return lockf (fd, F_TEST, 0) ? 0 : -1;
+ GF_ASSERT (fd >= -1);
+
+ if (lockf (fd, F_TEST, 0) == -1 &&
+ (errno == EAGAIN || errno == EACCES))
+ /* gsyncd keeps the pidfile locked */
+ return 0;
+
+ return -1;
}
/* status: return 0 when gsync is running
@@ -1921,10 +1928,6 @@ gsync_status (char *master, char *slave, int *status)
fd = gsyncd_getpidfile (master, slave, pidfile);
if (fd == -2)
return -1;
- if (fd == -1) {
- *status = -1;
- return 0;
- }
*status = gsync_status_byfd (fd);
@@ -4178,7 +4181,7 @@ out:
int
stop_gsync (char *master, char *slave, char **op_errstr)
{
- int32_t ret = -1;
+ int32_t ret = 0;
int pfd = -1;
pid_t pid = 0;
char pidfile[PATH_MAX] = {0,};
@@ -4192,17 +4195,16 @@ stop_gsync (char *master, char *slave, char **op_errstr)
priv = THIS->private;
pfd = gsyncd_getpidfile (master, slave, pidfile);
- if (pfd == -1) {
+ if (pfd == -2) {
gf_log ("", GF_LOG_WARNING, GEOREP" stop validation "
" failed");
- *op_errstr = gf_strdup (GEOREP "stop internal error");
+ *op_errstr = gf_strdup (GEOREP" stop internal error");
+ ret = -1;
goto out;
}
- ret = 0;
-
- if (gsync_status_byfd (pfd == -1)) {
+ if (gsync_status_byfd (pfd) == -1) {
gf_log ("", GF_LOG_WARNING, "gsyncd is not running");
- *op_errstr = gf_strdup ("gsyncd is not running");
+ *op_errstr = gf_strdup ("warning: gsyncd is not running");
goto out;
}
@@ -4221,10 +4223,10 @@ stop_gsync (char *master, char *slave, char **op_errstr)
* still be alive, give some more time
* before SIGKILL (hack)
*/
- sleep (0.05);
+ usleep (50000);
break;
}
- sleep (0.05);
+ usleep (50000);
}
kill (-pid, SIGKILL);
unlink (pidfile);