summaryrefslogtreecommitdiffstats
path: root/tests/volume.rc
diff options
context:
space:
mode:
authorGaurav Kumar Garg <garg.gaurav52@gmail.com>2016-03-02 17:42:07 +0530
committerAtin Mukherjee <amukherj@redhat.com>2017-08-11 07:36:41 +0000
commit220d406ad13d840e950eef001a2b36f87570058d (patch)
tree9740cb9546b441e555146f5bba5807b95e353703 /tests/volume.rc
parentcfdcdd1b1fea3f30d9131dd36afab6efeef2bee0 (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. Change-Id: Idb09e3fccb6a7355fbac1df31082637c8d7ab5b4 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>
Diffstat (limited to 'tests/volume.rc')
-rw-r--r--tests/volume.rc8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/volume.rc b/tests/volume.rc
index 369e5a7..1cee648 100644
--- a/tests/volume.rc
+++ b/tests/volume.rc
@@ -103,7 +103,7 @@ function get_nfs_pid ()
function read_nfs_pidfile ()
{
- echo `cat $GLUSTERD_WORKDIR/nfs/run/nfs.pid`
+ echo `cat $GLUSTERD_PIDFILEDIR/nfs/nfs.pid`
}
function cleanup_statedump {
@@ -230,7 +230,7 @@ function ec_child_up_count_shd {
}
function get_shd_process_pid {
- ps auxww | grep glusterfs | grep -E "glustershd/run/glustershd.pid" | awk '{print $2}' | head -1
+ ps auxww | grep glusterfs | grep -E "glustershd/glustershd.pid" | awk '{print $2}' | head -1
}
function generate_shd_statedump {
@@ -279,7 +279,7 @@ function get_brick_pidfile {
local host=$2
local brick=$3
local brick_hiphenated=$(echo $brick | tr '/' '-')
- echo $GLUSTERD_WORKDIR/vols/$vol/run/${host}${brick_hiphenated}.pid
+ echo $GLUSTERD_PIDFILEDIR/vols/$vol/${host}${brick_hiphenated}.pid
}
function get_brick_pid {
@@ -534,7 +534,7 @@ function volume_exists() {
function killall_gluster() {
pkill gluster
- find $GLUSTERD_WORKDIR -name '*.pid' | xargs rm -f
+ find $GLUSTERD_PIDFILEDIR -name '*.pid' | xargs rm -f
sleep 1
}