summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2013-05-23 11:25:27 +0200
committerVijay Bellur <vbellur@redhat.com>2013-05-25 11:41:29 -0700
commit689618e2fc0cecbfa06ef02b6c259a1a8502971f (patch)
tree62e3cc1a27b93951181bfd6d295e88b3090e20d0 /extras
parent2a2244972082c026061a08c76d03ec2f19b0d438 (diff)
extras: prevent "glusterd dead but subsys locked"
Commit b5bf14a6 added support for a file under /var/lock/subsys, Hoewever, killproc does remove the $PIDFILE which cases subsequent checks on its existence to fail. When glusterd was stopped successfully, the $PIDFILE has been removed already, there is no need to try to remove is again. Upon executing '/sbin/service glusterd status', the message 'glusterd dead but subsys locked' would be returned because the file under /var/lock/subsys was not removed. Bug: 960476 Change-Id: I781fe463e3c5472e42d668155cee4f63d349a568 Reported-by: Satheesaran Sundaramoorthi <sasundar@redhat.com> Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/5074 Reviewed-by: Jeff Darcy <jdarcy@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'extras')
-rwxr-xr-xextras/init.d/glusterd-Redhat.in1
1 files changed, 0 insertions, 1 deletions
diff --git a/extras/init.d/glusterd-Redhat.in b/extras/init.d/glusterd-Redhat.in
index 7db7e1b..e320708 100755
--- a/extras/init.d/glusterd-Redhat.in
+++ b/extras/init.d/glusterd-Redhat.in
@@ -72,7 +72,6 @@ stop()
echo -n $"Stopping $BASE:"
if pidofproc -p $PIDFILE $GLUSTERD_BIN &> /dev/null; then
killproc -p $PIDFILE $BASE
- [ -w $PIDFILE ] && rm -f $PIDFILE
else
killproc $BASE
fi