diff options
| -rw-r--r-- | libglusterfs/src/common-utils.c | 3 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-messages.h | 3 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c index 6c28690c8ff..66a78e9f7cb 100644 --- a/libglusterfs/src/common-utils.c +++ b/libglusterfs/src/common-utils.c @@ -4001,9 +4001,6 @@ gf_is_service_running (char *pidfile, int *pid) ret = lockf (fno, F_TEST, 0); if (ret == -1) running = _gf_true; - if (!pid) { - goto out; - } ret = fscanf (file, "%d", pid); if (ret <= 0) { diff --git a/xlators/mgmt/glusterd/src/glusterd-messages.h b/xlators/mgmt/glusterd/src/glusterd-messages.h index 218071396d9..cb2a558ca53 100644 --- a/xlators/mgmt/glusterd/src/glusterd-messages.h +++ b/xlators/mgmt/glusterd/src/glusterd-messages.h @@ -636,7 +636,8 @@ GLFS_MSGID(GLUSTERD, GD_MSG_LOCALTIME_LOGGING_DISABLE, GD_MSG_PORTS_EXHAUSTED, GD_MSG_CHANGELOG_GET_FAIL, - GD_MSG_MANAGER_FUNCTION_FAILED + GD_MSG_MANAGER_FUNCTION_FAILED, + GD_MSG_REMOVE_FILE_FAILED ); #endif /* !_GLUSTERD_MESSAGES_H_ */ diff --git a/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c index 7400dafc7fa..cb361a76d7a 100644 --- a/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c +++ b/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c @@ -13,6 +13,7 @@ #include <signal.h> #include "glusterd.h" +#include "glusterd-utils.h" #include "common-utils.h" #include "xlator.h" #include "logging.h" @@ -120,6 +121,9 @@ glusterd_proc_stop (glusterd_proc_t *proc, int sig, int flags) "reason:%s", pid, strerror(errno)); goto out; } + ret = glusterd_unlink_file (proc->pidfile); + if (ret) + goto out; } ret = 0; |