From bf818f9a9e299475b09b85e28f3bca57f4a00624 Mon Sep 17 00:00:00 2001 From: Rahul C S Date: Sat, 17 Mar 2012 18:32:04 +0530 Subject: Change option brick-with-valgrind to run-with-valgrind brick-with-valgrind does not make much sense because all the glusterfs/glusterfsd server processes are run with valgrind. So changing the option from brick-with-valgrind to run-with-valgrind. Also fix misspelt 'valgrnd' for valgrind log file namenames. Change-Id: I87aad6d65ffc37d8f8679be215709a9174385ecd BUG: 804293 Signed-off-by: Rahul C S Reviewed-on: http://review.gluster.com/2965 Tested-by: Gluster Build System Reviewed-by: Anand Avati --- xlators/mgmt/glusterd/src/glusterd-utils.c | 4 ++-- xlators/mgmt/glusterd/src/glusterd.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'xlators') diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 3c0846351..9cc436496 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -1199,7 +1199,7 @@ glusterd_volume_start_glusterfs (glusterd_volinfo_t *volinfo, volinfo->volname, exp_path); } else { snprintf (valgrind_logfile, PATH_MAX, - "%s/bricks/valgrnd-%s-%s.log", + "%s/bricks/valgrind-%s-%s.log", DEFAULT_LOG_FILE_DIRECTORY, volinfo->volname, exp_path); } @@ -2744,7 +2744,7 @@ glusterd_nodesvc_start (char *server) #ifdef DEBUG if (priv->valgrind) { snprintf (valgrind_logfile, PATH_MAX, - "%s/valgrnd-%s.log", + "%s/valgrind-%s.log", DEFAULT_LOG_FILE_DIRECTORY, server); diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c index 3ffd7b8eb..b92a08a19 100644 --- a/xlators/mgmt/glusterd/src/glusterd.c +++ b/xlators/mgmt/glusterd/src/glusterd.c @@ -954,15 +954,15 @@ init (xlator_t *this) /* Set option to run bricks on valgrind if enabled in glusterd.vol */ #ifdef DEBUG conf->valgrind = _gf_false; - ret = dict_get_str (this->options, "brick-with-valgrind", &valgrind_str); + ret = dict_get_str (this->options, "run-with-valgrind", &valgrind_str); if (ret < 0) { gf_log (this->name, GF_LOG_DEBUG, - "cannot get brick-with-valgrind value"); + "cannot get run-with-valgrind value"); } if (valgrind_str) { if (gf_string2boolean (valgrind_str, &(conf->valgrind))) { gf_log (this->name, GF_LOG_WARNING, - "brick-with-valgrind value not a boolean string"); + "run-with-valgrind value not a boolean string"); } } #endif @@ -1131,7 +1131,7 @@ struct volume_options options[] = { .type = GF_OPTION_TYPE_ANY, }, #ifdef DEBUG - { .key = {"brick-with-valgrind"}, + { .key = {"run-with-valgrind"}, .type = GF_OPTION_TYPE_BOOL, }, #endif -- cgit