From 220d406ad13d840e950eef001a2b36f87570058d Mon Sep 17 00:00:00 2001 From: Gaurav Kumar Garg Date: Wed, 2 Mar 2016 17:42:07 +0530 Subject: glusterd: Gluster should keep PID file in correct location Currently Gluster keeps process pid information of all the daemons and brick processes in Gluster configuration file directory (ie., /var/lib/glusterd/*). These pid files should be seperate from configuration files. Deletion of the configuration file directory might result into serious problems. Also, /var/run/gluster is the default placeholder directory for pid files. So, with this fix Gluster will keep all process pid information of all processes in /var/run/gluster/* directory. Change-Id: Idb09e3fccb6a7355fbac1df31082637c8d7ab5b4 BUG: 1258561 Signed-off-by: Gaurav Kumar Garg Signed-off-by: Saravanakumar Arumugam Reviewed-on: https://review.gluster.org/13580 Tested-by: MOHIT AGRAWAL Smoke: Gluster Build System CentOS-regression: Gluster Build System Reviewed-by: Atin Mukherjee --- xlators/mgmt/glusterd/src/glusterd-svc-mgmt.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'xlators/mgmt/glusterd/src/glusterd-svc-mgmt.c') diff --git a/xlators/mgmt/glusterd/src/glusterd-svc-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-svc-mgmt.c index 4d60c856171..f2298653ed7 100644 --- a/xlators/mgmt/glusterd/src/glusterd-svc-mgmt.c +++ b/xlators/mgmt/glusterd/src/glusterd-svc-mgmt.c @@ -86,8 +86,9 @@ glusterd_svc_init_common (glusterd_svc_t *svc, goto out; /* Initialize the process mgmt */ - glusterd_svc_build_pidfile_path (svc_name, workdir, pidfile, - sizeof(pidfile)); + glusterd_svc_build_pidfile_path (svc_name, priv->rundir, + pidfile, sizeof(pidfile)); + glusterd_svc_build_volfile_path (svc_name, workdir, volfile, sizeof (volfile)); @@ -133,7 +134,7 @@ int glusterd_svc_init (glusterd_svc_t *svc, char *svc_name) priv = this->private; GF_ASSERT (priv); - glusterd_svc_build_rundir (svc_name, priv->workdir, rundir, + glusterd_svc_build_rundir (svc_name, priv->rundir, rundir, sizeof (rundir)); ret = glusterd_svc_init_common (svc, svc_name, priv->workdir, rundir, DEFAULT_LOG_FILE_DIRECTORY, NULL); @@ -276,7 +277,7 @@ glusterd_svc_build_rundir (char *server, char *workdir, char *path, size_t len) GF_ASSERT (len == PATH_MAX); glusterd_svc_build_svcdir (server, workdir, dir, sizeof (dir)); - snprintf (path, len, "%s/run", dir); + snprintf (path, len, "%s", dir); } int -- cgit