From 22ac7241b2f8c1bb3db2678b8b6b9a364f14876c 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. > 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 > cherry pick from commit 220d406ad13d840e950eef001a2b36f87570058d BUG: 1480459 Change-Id: Idb09e3fccb6a7355fbac1df31082637c8d7ab5b4 Signed-off-by: Mohit Agrawal Reviewed-on: https://review.gluster.org/18023 Reviewed-by: Atin Mukherjee Smoke: Gluster Build System CentOS-regression: Gluster Build System --- .../bugs/glusterd/bug-1225716-brick-online-validation-remove-brick.t | 1 - tests/bugs/glusterd/bug-916549.t | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'tests/bugs/glusterd') diff --git a/tests/bugs/glusterd/bug-1225716-brick-online-validation-remove-brick.t b/tests/bugs/glusterd/bug-1225716-brick-online-validation-remove-brick.t index 47403b44ee6..d168866ab63 100644 --- a/tests/bugs/glusterd/bug-1225716-brick-online-validation-remove-brick.t +++ b/tests/bugs/glusterd/bug-1225716-brick-online-validation-remove-brick.t @@ -28,7 +28,6 @@ EXPECT_WITHIN $REBALANCE_TIMEOUT "completed" remove_brick_status_completed_field #kill a brick process kill_brick $V0 $H0 $B0/${V0}1 -EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT "0" brick_up_status $V0 $H0 $B0/${V0}1 #remove-brick commit should pass even if the brick is down TEST $CLI volume remove-brick $V0 $H0:$B0/${V0}1 commit diff --git a/tests/bugs/glusterd/bug-916549.t b/tests/bugs/glusterd/bug-916549.t index bedbdd60bb6..6e3612dce94 100755 --- a/tests/bugs/glusterd/bug-916549.t +++ b/tests/bugs/glusterd/bug-916549.t @@ -8,8 +8,8 @@ TEST glusterd; TEST $CLI volume create $V0 $H0:$B0/${V0}1; TEST $CLI volume start $V0; -pid_file=$(ls $GLUSTERD_WORKDIR/vols/$V0/run); -brick_pid=$(cat $GLUSTERD_WORKDIR/vols/$V0/run/$pid_file); +pid_file=$(ls $GLUSTERD_PIDFILEDIR/vols/$V0/); +brick_pid=$(cat $GLUSTERD_PIDFILEDIR/vols/$V0/$pid_file); kill -SIGKILL $brick_pid; -- cgit