diff options
| author | Gaurav Kumar Garg <garg.gaurav52@gmail.com> | 2016-03-02 17:42:07 +0530 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2017-08-12 13:38:30 +0000 |
| commit | 22ac7241b2f8c1bb3db2678b8b6b9a364f14876c (patch) | |
| tree | 83a763d82e6b90d8fc9cff0236331fdb3eea82f1 /xlators/mgmt/glusterd/src/glusterd-store.c | |
| parent | ffae8ec38e9a5fd0aa9a5fbba86a22f805b8cfa8 (diff) | |
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.
> BUG: 1258561
> Signed-off-by: Gaurav Kumar Garg <ggarg@redhat.com>
> Signed-off-by: Saravanakumar Arumugam <sarumuga@redhat.com>
> Reviewed-on: https://review.gluster.org/13580
> Tested-by: MOHIT AGRAWAL <moagrawa@redhat.com>
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
> Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
> cherry pick from commit 220d406ad13d840e950eef001a2b36f87570058d
BUG: 1480459
Change-Id: Idb09e3fccb6a7355fbac1df31082637c8d7ab5b4
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
Reviewed-on: https://review.gluster.org/18023
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-store.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-store.c | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c index 8eb301f040f..14ccac8a9e3 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.c +++ b/xlators/mgmt/glusterd/src/glusterd-store.c @@ -1069,6 +1069,19 @@ glusterd_store_voldirpath_set (glusterd_volinfo_t *volinfo, char *voldirpath, GLUSTERD_GET_VOLUME_DIR (voldirpath, volinfo, priv); } +static void +glusterd_store_piddirpath_set (glusterd_volinfo_t *volinfo, char *piddirpath, + size_t len) +{ + glusterd_conf_t *priv = NULL; + + GF_ASSERT (volinfo); + priv = THIS->private; + GF_ASSERT (priv); + + GLUSTERD_GET_VOLUME_PID_DIR (piddirpath, volinfo, priv); +} + static int32_t glusterd_store_create_volume_dir (glusterd_volinfo_t *volinfo) { @@ -1085,6 +1098,23 @@ glusterd_store_create_volume_dir (glusterd_volinfo_t *volinfo) return ret; } +static int32_t +glusterd_store_create_volume_run_dir (glusterd_volinfo_t *volinfo) +{ + int32_t ret = -1; + char piddirpath[PATH_MAX] = {0,}; + + GF_ASSERT (volinfo); + + glusterd_store_piddirpath_set (volinfo, piddirpath, + sizeof (piddirpath)); + + ret = gf_store_mkdir (piddirpath); + + gf_msg_debug (THIS->name, 0, "Returning with %d", ret); + return ret; +} + int32_t glusterd_store_create_snap_dir (glusterd_snap_t *snap) { @@ -1762,6 +1792,10 @@ glusterd_store_volinfo (glusterd_volinfo_t *volinfo, glusterd_volinfo_ver_ac_t a if (ret) goto out; + ret = glusterd_store_create_volume_run_dir (volinfo); + if (ret) + goto out; + ret = glusterd_store_create_vol_shandle_on_absence (volinfo); if (ret) goto out; |