From 689618e2fc0cecbfa06ef02b6c259a1a8502971f Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 23 May 2013 11:25:27 +0200 Subject: 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 Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/5074 Reviewed-by: Jeff Darcy Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- extras/init.d/glusterd-Redhat.in | 1 - 1 file changed, 1 deletion(-) diff --git a/extras/init.d/glusterd-Redhat.in b/extras/init.d/glusterd-Redhat.in index 7db7e1be7..e320708ae 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 -- cgit