From 089351f3d80d37cf2d46f05211191bef5232c12c Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Tue, 3 Apr 2018 21:28:37 +0530 Subject: glusterd: honour localtime-logging for all the daemons Change-Id: I97a70d29365b0a454241ac5f5cae56d93eefd73a Fixes: bz#1563334 Signed-off-by: Atin Mukherjee --- xlators/mgmt/glusterd/src/glusterd-gfproxyd-svc.c | 6 ++++++ xlators/mgmt/glusterd/src/glusterd-rebalance.c | 6 ++++++ xlators/mgmt/glusterd/src/glusterd-snapd-svc.c | 6 ++++++ xlators/mgmt/glusterd/src/glusterd-svc-mgmt.c | 6 ++++++ xlators/mgmt/glusterd/src/glusterd-tierd-svc.c | 6 ++++++ 5 files changed, 30 insertions(+) (limited to 'xlators') diff --git a/xlators/mgmt/glusterd/src/glusterd-gfproxyd-svc.c b/xlators/mgmt/glusterd/src/glusterd-gfproxyd-svc.c index 4ebc823619d..c0b96b10995 100644 --- a/xlators/mgmt/glusterd/src/glusterd-gfproxyd-svc.c +++ b/xlators/mgmt/glusterd/src/glusterd-gfproxyd-svc.c @@ -263,6 +263,7 @@ glusterd_gfproxydsvc_start (glusterd_svc_t *svc, int flags) char msg[1024] = {0,}; char gfproxyd_id[PATH_MAX] = {0,}; glusterd_volinfo_t *volinfo = NULL; + char *localtime_logging = NULL; this = THIS; GF_VALIDATE_OR_GOTO ("glusterd", this, out); @@ -312,6 +313,11 @@ glusterd_gfproxydsvc_start (glusterd_svc_t *svc, int flags) if (volinfo->memory_accounting) runner_add_arg (&runner, "--mem-accounting"); + if (dict_get_str (priv->opts, GLUSTERD_LOCALTIME_LOGGING_KEY, + &localtime_logging) == 0) { + if (strcmp (localtime_logging, "enable") == 0) + runner_add_arg (&runner, "--localtime-logging"); + } gfproxyd_port = pmap_assign_port (this, volinfo->gfproxyd.port, gfproxyd_id); diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c index 02c47be8234..7fa5ae7e983 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c +++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c @@ -195,6 +195,7 @@ glusterd_handle_defrag_start (glusterd_volinfo_t *volinfo, char *op_errstr, char volname[PATH_MAX] = {0,}; char valgrind_logfile[PATH_MAX] = {0,}; char *volfileserver = NULL; + char *localtime_logging = NULL; this = THIS; GF_VALIDATE_OR_GOTO ("glusterd", this, out); @@ -312,6 +313,11 @@ glusterd_handle_defrag_start (glusterd_volinfo_t *volinfo, char *op_errstr, runner_argprintf (&runner, logfile); if (volinfo->memory_accounting) runner_add_arg (&runner, "--mem-accounting"); + if (dict_get_str (priv->opts, GLUSTERD_LOCALTIME_LOGGING_KEY, + &localtime_logging) == 0) { + if (strcmp (localtime_logging, "enable") == 0) + runner_add_arg (&runner, "--localtime-logging"); + } ret = runner_run_nowait (&runner); if (ret) { diff --git a/xlators/mgmt/glusterd/src/glusterd-snapd-svc.c b/xlators/mgmt/glusterd/src/glusterd-snapd-svc.c index b6e6a814ca2..c32a081156e 100644 --- a/xlators/mgmt/glusterd/src/glusterd-snapd-svc.c +++ b/xlators/mgmt/glusterd/src/glusterd-snapd-svc.c @@ -226,6 +226,7 @@ glusterd_snapdsvc_start (glusterd_svc_t *svc, int flags) char snapd_id[PATH_MAX] = {0,}; glusterd_volinfo_t *volinfo = NULL; glusterd_snapdsvc_t *snapd = NULL; + char *localtime_logging = NULL; this = THIS; GF_ASSERT(this); @@ -300,6 +301,11 @@ glusterd_snapdsvc_start (glusterd_svc_t *svc, int flags) "-S", svc->conn.sockpath, "--process-name", svc->name, NULL); + if (dict_get_str (priv->opts, GLUSTERD_LOCALTIME_LOGGING_KEY, + &localtime_logging) == 0) { + if (strcmp (localtime_logging, "enable") == 0) + runner_add_arg (&runner, "--localtime-logging"); + } snapd_port = pmap_assign_port (THIS, volinfo->snapd.port, snapd_id); if (!snapd_port) { diff --git a/xlators/mgmt/glusterd/src/glusterd-svc-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-svc-mgmt.c index f2298653ed7..ba948b4c6f6 100644 --- a/xlators/mgmt/glusterd/src/glusterd-svc-mgmt.c +++ b/xlators/mgmt/glusterd/src/glusterd-svc-mgmt.c @@ -150,6 +150,7 @@ glusterd_svc_start (glusterd_svc_t *svc, int flags, dict_t *cmdline) glusterd_conf_t *priv = NULL; xlator_t *this = NULL; char valgrind_logfile[PATH_MAX] = {0}; + char *localtime_logging = NULL; this = THIS; GF_ASSERT (this); @@ -190,6 +191,11 @@ glusterd_svc_start (glusterd_svc_t *svc, int flags, dict_t *cmdline) "-S", svc->conn.sockpath, NULL); + if (dict_get_str (priv->opts, GLUSTERD_LOCALTIME_LOGGING_KEY, + &localtime_logging) == 0) { + if (strcmp (localtime_logging, "enable") == 0) + runner_add_arg (&runner, "--localtime-logging"); + } if (cmdline) dict_foreach (cmdline, svc_add_args, (void *) &runner); diff --git a/xlators/mgmt/glusterd/src/glusterd-tierd-svc.c b/xlators/mgmt/glusterd/src/glusterd-tierd-svc.c index 378ecdb7a0d..a83da59960a 100644 --- a/xlators/mgmt/glusterd/src/glusterd-tierd-svc.c +++ b/xlators/mgmt/glusterd/src/glusterd-tierd-svc.c @@ -259,6 +259,7 @@ glusterd_tierdsvc_start (glusterd_svc_t *svc, int flags) glusterd_volinfo_t *volinfo = NULL; glusterd_tierdsvc_t *tierd = NULL; int cmd = GF_DEFRAG_CMD_START_TIER; + char *localtime_logging = NULL; this = THIS; GF_VALIDATE_OR_GOTO (THIS->name, this, out); @@ -354,6 +355,11 @@ glusterd_tierdsvc_start (glusterd_svc_t *svc, int flags) volinfo->rebal.commit_hash); if (volinfo->memory_accounting) runner_add_arg (&runner, "--mem-accounting"); + if (dict_get_str (priv->opts, GLUSTERD_LOCALTIME_LOGGING_KEY, + &localtime_logging) == 0) { + if (strcmp (localtime_logging, "enable") == 0) + runner_add_arg (&runner, "--localtime-logging"); + } snprintf (msg, sizeof (msg), "Starting the tierd service for volume %s", volinfo->volname); -- cgit