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-bitd-svc.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-bitd-svc.c')
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-bitd-svc.c | 283 |
1 files changed, 140 insertions, 143 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-bitd-svc.c b/xlators/mgmt/glusterd/src/glusterd-bitd-svc.c index 69c70754731..b01c2599dfb 100644 --- a/xlators/mgmt/glusterd/src/glusterd-bitd-svc.c +++ b/xlators/mgmt/glusterd/src/glusterd-bitd-svc.c @@ -17,193 +17,190 @@ #include "glusterd-svc-helper.h" void -glusterd_bitdsvc_build (glusterd_svc_t *svc) +glusterd_bitdsvc_build(glusterd_svc_t *svc) { - svc->manager = glusterd_bitdsvc_manager; - svc->start = glusterd_bitdsvc_start; - svc->stop = glusterd_bitdsvc_stop; + svc->manager = glusterd_bitdsvc_manager; + svc->start = glusterd_bitdsvc_start; + svc->stop = glusterd_bitdsvc_stop; } int -glusterd_bitdsvc_init (glusterd_svc_t *svc) +glusterd_bitdsvc_init(glusterd_svc_t *svc) { - return glusterd_svc_init (svc, bitd_svc_name); + return glusterd_svc_init(svc, bitd_svc_name); } static int -glusterd_bitdsvc_create_volfile () +glusterd_bitdsvc_create_volfile() { - char filepath[PATH_MAX] = {0,}; - int ret = -1; - glusterd_conf_t *conf = NULL; - xlator_t *this = NULL; - - this = THIS; - conf = this->private; - GF_ASSERT (conf); - - - glusterd_svc_build_volfile_path (bitd_svc_name, conf->workdir, - filepath, sizeof (filepath)); - - ret = glusterd_create_global_volfile (build_bitd_graph, - filepath, NULL); - if (ret) { - gf_msg (this->name, GF_LOG_ERROR, 0, - GD_MSG_VOLFILE_CREATE_FAIL, - "Failed to create volfile"); - goto out; - } + char filepath[PATH_MAX] = { + 0, + }; + int ret = -1; + glusterd_conf_t *conf = NULL; + xlator_t *this = NULL; + + this = THIS; + conf = this->private; + GF_ASSERT(conf); + + glusterd_svc_build_volfile_path(bitd_svc_name, conf->workdir, filepath, + sizeof(filepath)); + + ret = glusterd_create_global_volfile(build_bitd_graph, filepath, NULL); + if (ret) { + gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_VOLFILE_CREATE_FAIL, + "Failed to create volfile"); + goto out; + } out: - gf_msg_debug (this->name, 0, "Returning %d", ret); + gf_msg_debug(this->name, 0, "Returning %d", ret); - return ret; + return ret; } int -glusterd_bitdsvc_manager (glusterd_svc_t *svc, void *data, int flags) +glusterd_bitdsvc_manager(glusterd_svc_t *svc, void *data, int flags) { - int ret = 0; - xlator_t *this = NULL; - - this = THIS; - GF_ASSERT (this); - - if (!svc->inited) { - ret = glusterd_bitdsvc_init (svc); - if (ret) { - gf_msg (this->name, GF_LOG_ERROR, 0, - GD_MSG_BITD_INIT_FAIL, "Failed to init " - "bitd service"); - goto out; - } else { - svc->inited = _gf_true; - gf_msg_debug (this->name, 0, "BitD service " - "initialized"); - } - } + int ret = 0; + xlator_t *this = NULL; + + this = THIS; + GF_ASSERT(this); - if (glusterd_should_i_stop_bitd ()) { - ret = svc->stop (svc, SIGTERM); + if (!svc->inited) { + ret = glusterd_bitdsvc_init(svc); + if (ret) { + gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_BITD_INIT_FAIL, + "Failed to init " + "bitd service"); + goto out; } else { - ret = glusterd_bitdsvc_create_volfile (); - if (ret) - goto out; + svc->inited = _gf_true; + gf_msg_debug(this->name, 0, + "BitD service " + "initialized"); + } + } + + if (glusterd_should_i_stop_bitd()) { + ret = svc->stop(svc, SIGTERM); + } else { + ret = glusterd_bitdsvc_create_volfile(); + if (ret) + goto out; - ret = svc->stop (svc, SIGKILL); - if (ret) - goto out; + ret = svc->stop(svc, SIGKILL); + if (ret) + goto out; - ret = svc->start (svc, flags); - if (ret) - goto out; + ret = svc->start(svc, flags); + if (ret) + goto out; - ret = glusterd_conn_connect (&(svc->conn)); - if (ret) - goto out; - } + ret = glusterd_conn_connect(&(svc->conn)); + if (ret) + goto out; + } out: - if (ret) - gf_event (EVENT_SVC_MANAGER_FAILED, "svc_name=%s", svc->name); + if (ret) + gf_event(EVENT_SVC_MANAGER_FAILED, "svc_name=%s", svc->name); - gf_msg_debug (THIS->name, 0, "Returning %d", ret); + gf_msg_debug(THIS->name, 0, "Returning %d", ret); - return ret; + return ret; } int -glusterd_bitdsvc_start (glusterd_svc_t *svc, int flags) +glusterd_bitdsvc_start(glusterd_svc_t *svc, int flags) { - int ret = -1; - dict_t *cmdict = NULL; + int ret = -1; + dict_t *cmdict = NULL; - cmdict = dict_new (); - if (!cmdict) - goto error_return; + cmdict = dict_new(); + if (!cmdict) + goto error_return; - ret = dict_set_str (cmdict, "cmdarg0", "--global-timer-wheel"); - if (ret) - goto dealloc_dict; + ret = dict_set_str(cmdict, "cmdarg0", "--global-timer-wheel"); + if (ret) + goto dealloc_dict; - ret = glusterd_svc_start (svc, flags, cmdict); + ret = glusterd_svc_start(svc, flags, cmdict); - dealloc_dict: - dict_unref (cmdict); - error_return: - return ret; +dealloc_dict: + dict_unref(cmdict); +error_return: + return ret; } int -glusterd_bitdsvc_stop (glusterd_svc_t *svc, int sig) +glusterd_bitdsvc_stop(glusterd_svc_t *svc, int sig) { - return glusterd_svc_stop (svc, sig); + return glusterd_svc_stop(svc, sig); } int -glusterd_bitdsvc_reconfigure () +glusterd_bitdsvc_reconfigure() { - int ret = -1; - xlator_t *this = NULL; - glusterd_conf_t *priv = NULL; - gf_boolean_t identical = _gf_false; - - this = THIS; - GF_VALIDATE_OR_GOTO (this->name, this, out); - - priv = this->private; - GF_VALIDATE_OR_GOTO (this->name, priv, out); - - if (glusterd_should_i_stop_bitd ()) - goto manager; - /* - * Check both OLD and NEW volfiles, if they are SAME by size - * and cksum i.e. "character-by-character". If YES, then - * NOTHING has been changed, just return. - */ - ret = glusterd_svc_check_volfile_identical (priv->bitd_svc.name, - build_bitd_graph, - &identical); - if (ret) - goto out; - if (identical) { - ret = 0; - goto out; - } - - /* - * They are not identical. Find out if the topology is changed - * OR just the volume options. If just the options which got - * changed, then inform the xlator to reconfigure the options. - */ - identical = _gf_false; /* RESET the FLAG */ - ret = glusterd_svc_check_topology_identical (priv->bitd_svc.name, - build_bitd_graph, - &identical); - if (ret) - goto out; /*not able to compare due to some corruption */ - - /* Topology is not changed, but just the options. But write the - * options to bitd volfile, so that bitd will be reconfigured. - */ - if (identical) { - ret = glusterd_bitdsvc_create_volfile (); - if (ret == 0) {/* Only if above PASSES */ - ret = glusterd_fetchspec_notify (THIS); - } - goto out; + int ret = -1; + xlator_t *this = NULL; + glusterd_conf_t *priv = NULL; + gf_boolean_t identical = _gf_false; + + this = THIS; + GF_VALIDATE_OR_GOTO(this->name, this, out); + + priv = this->private; + GF_VALIDATE_OR_GOTO(this->name, priv, out); + + if (glusterd_should_i_stop_bitd()) + goto manager; + /* + * Check both OLD and NEW volfiles, if they are SAME by size + * and cksum i.e. "character-by-character". If YES, then + * NOTHING has been changed, just return. + */ + ret = glusterd_svc_check_volfile_identical(priv->bitd_svc.name, + build_bitd_graph, &identical); + if (ret) + goto out; + if (identical) { + ret = 0; + goto out; + } + + /* + * They are not identical. Find out if the topology is changed + * OR just the volume options. If just the options which got + * changed, then inform the xlator to reconfigure the options. + */ + identical = _gf_false; /* RESET the FLAG */ + ret = glusterd_svc_check_topology_identical(priv->bitd_svc.name, + build_bitd_graph, &identical); + if (ret) + goto out; /*not able to compare due to some corruption */ + + /* Topology is not changed, but just the options. But write the + * options to bitd volfile, so that bitd will be reconfigured. + */ + if (identical) { + ret = glusterd_bitdsvc_create_volfile(); + if (ret == 0) { /* Only if above PASSES */ + ret = glusterd_fetchspec_notify(THIS); } + goto out; + } manager: - /* - * bitd volfile's topology has been changed. bitd server needs - * to be RESTARTED to ACT on the changed volfile. - */ - ret = priv->bitd_svc.manager (&(priv->bitd_svc), NULL, - PROC_START_NO_WAIT); + /* + * bitd volfile's topology has been changed. bitd server needs + * to be RESTARTED to ACT on the changed volfile. + */ + ret = priv->bitd_svc.manager(&(priv->bitd_svc), NULL, PROC_START_NO_WAIT); out: - gf_msg_debug (this->name, 0, "Returning %d", ret); - return ret; + gf_msg_debug(this->name, 0, "Returning %d", ret); + return ret; } |