diff options
author | Gluster Ant <bugzilla-bot@gluster.org> | 2018-09-12 17:52:45 +0530 |
---|---|---|
committer | Nigel Babu <nigelb@redhat.com> | 2018-09-12 17:52:45 +0530 |
commit | e16868dede6455cab644805af6fe1ac312775e13 (patch) | |
tree | 15aebdb4fff2d87cf8a72f836816b3aa634da58d /xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c | |
parent | 45a71c0548b6fd2c757aa2e7b7671a1411948894 (diff) |
Land part 2 of clang-format changes
Change-Id: Ia84cc24c8924e6d22d02ac15f611c10e26db99b4
Signed-off-by: Nigel Babu <nigelb@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c')
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c | 180 |
1 files changed, 91 insertions, 89 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c index cb361a76d7a..200e3056117 100644 --- a/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c +++ b/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c @@ -21,128 +21,130 @@ #include "glusterd-proc-mgmt.h" int -glusterd_proc_init (glusterd_proc_t *proc, char *name, char *pidfile, - char *logdir, char *logfile, char *volfile, char *volfileid, - char *volfileserver) +glusterd_proc_init(glusterd_proc_t *proc, char *name, char *pidfile, + char *logdir, char *logfile, char *volfile, char *volfileid, + char *volfileserver) { - int ret = -1; + int ret = -1; - ret = snprintf (proc->name, sizeof (proc->name), "%s", name); - if (ret < 0) - goto out; + ret = snprintf(proc->name, sizeof(proc->name), "%s", name); + if (ret < 0) + goto out; - ret = snprintf (proc->pidfile, sizeof (proc->pidfile), "%s", pidfile); - if (ret < 0) - goto out; + ret = snprintf(proc->pidfile, sizeof(proc->pidfile), "%s", pidfile); + if (ret < 0) + goto out; - ret = snprintf (proc->logdir, sizeof (proc->logdir), "%s", logdir); - if (ret < 0) - goto out; + ret = snprintf(proc->logdir, sizeof(proc->logdir), "%s", logdir); + if (ret < 0) + goto out; - ret = snprintf (proc->logfile, sizeof (proc->logfile), "%s", logfile); - if (ret < 0) - goto out; + ret = snprintf(proc->logfile, sizeof(proc->logfile), "%s", logfile); + if (ret < 0) + goto out; - ret = snprintf (proc->volfile, sizeof (proc->volfile), "%s", volfile); - if (ret < 0) - goto out; + ret = snprintf(proc->volfile, sizeof(proc->volfile), "%s", volfile); + if (ret < 0) + goto out; - ret = snprintf (proc->volfileid, sizeof (proc->volfileid), "%s", - volfileid); - if (ret < 0) - goto out; + ret = snprintf(proc->volfileid, sizeof(proc->volfileid), "%s", volfileid); + if (ret < 0) + goto out; - ret = snprintf (proc->volfileserver, sizeof (proc->volfileserver), "%s", - volfileserver); - if (ret < 0) - goto out; + ret = snprintf(proc->volfileserver, sizeof(proc->volfileserver), "%s", + volfileserver); + if (ret < 0) + goto out; out: - if (ret > 0) - ret = 0; + if (ret > 0) + ret = 0; - return ret; + return ret; } int -glusterd_proc_stop (glusterd_proc_t *proc, int sig, int flags) +glusterd_proc_stop(glusterd_proc_t *proc, int sig, int flags) { + /* NB: Copy-paste code from glusterd_service_stop, the source may be + * removed once all daemon management use proc */ - /* NB: Copy-paste code from glusterd_service_stop, the source may be - * removed once all daemon management use proc */ - - int32_t ret = -1; - pid_t pid = -1; - xlator_t *this = NULL; - glusterd_conf_t *conf = NULL; + int32_t ret = -1; + pid_t pid = -1; + xlator_t *this = NULL; + glusterd_conf_t *conf = NULL; - this = THIS; - GF_ASSERT (this); + this = THIS; + GF_ASSERT(this); - conf = this->private; - GF_ASSERT (conf); + conf = this->private; + GF_ASSERT(conf); - if (!gf_is_service_running (proc->pidfile, &pid)) { + if (!gf_is_service_running(proc->pidfile, &pid)) { + ret = 0; + gf_msg(this->name, GF_LOG_INFO, 0, GD_MSG_ALREADY_STOPPED, + "%s already stopped", proc->name); + goto out; + } + gf_msg(this->name, GF_LOG_INFO, 0, GD_MSG_SVC_STOP_SUCCESS, + "Stopping %s daemon running in pid: " + "%d", + proc->name, pid); + + ret = kill(pid, sig); + if (ret) { + switch (errno) { + case ESRCH: + gf_msg_debug(this->name, 0, + "%s is already " + "stopped", + proc->name); ret = 0; - gf_msg (this->name, GF_LOG_INFO, 0, - GD_MSG_ALREADY_STOPPED, "%s already stopped", - proc->name); goto out; + default: + gf_msg(this->name, GF_LOG_ERROR, errno, GD_MSG_SVC_KILL_FAIL, + "Unable to kill %s " + "service, reason:%s", + proc->name, strerror(errno)); } - gf_msg (this->name, GF_LOG_INFO, 0, GD_MSG_SVC_STOP_SUCCESS, - "Stopping %s daemon running in pid: " "%d", proc->name, pid); - - ret = kill (pid, sig); + } + if (flags != PROC_STOP_FORCE) + goto out; + + synclock_unlock(&conf->big_lock); + sleep(1); + synclock_lock(&conf->big_lock); + if (gf_is_service_running(proc->pidfile, &pid)) { + ret = kill(pid, SIGKILL); if (ret) { - switch (errno) { - case ESRCH: - gf_msg_debug (this->name, 0, "%s is already " - "stopped", proc->name); - ret = 0; - goto out; - default: - gf_msg (this->name, GF_LOG_ERROR, errno, - GD_MSG_SVC_KILL_FAIL, "Unable to kill %s " - "service, reason:%s", proc->name, - strerror (errno)); - } - } - if (flags != PROC_STOP_FORCE) - goto out; - - synclock_unlock (&conf->big_lock); - sleep (1); - synclock_lock (&conf->big_lock); - if (gf_is_service_running (proc->pidfile, &pid)) { - ret = kill (pid, SIGKILL); - if (ret) { - gf_msg (this->name, GF_LOG_ERROR, errno, - GD_MSG_PID_KILL_FAIL, "Unable to kill pid:%d, " - "reason:%s", pid, strerror(errno)); - goto out; - } - ret = glusterd_unlink_file (proc->pidfile); - if (ret) - goto out; + gf_msg(this->name, GF_LOG_ERROR, errno, GD_MSG_PID_KILL_FAIL, + "Unable to kill pid:%d, " + "reason:%s", + pid, strerror(errno)); + goto out; } + ret = glusterd_unlink_file(proc->pidfile); + if (ret) + goto out; + } - ret = 0; + ret = 0; out: - return ret; + return ret; } int -glusterd_proc_get_pid (glusterd_proc_t *proc) +glusterd_proc_get_pid(glusterd_proc_t *proc) { - int pid = -1; - (void) gf_is_service_running (proc->pidfile, &pid); - return pid; + int pid = -1; + (void)gf_is_service_running(proc->pidfile, &pid); + return pid; } int -glusterd_proc_is_running (glusterd_proc_t *proc) +glusterd_proc_is_running(glusterd_proc_t *proc) { - int pid = -1; + int pid = -1; - return gf_is_service_running (proc->pidfile, &pid); + return gf_is_service_running(proc->pidfile, &pid); } |