You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2013/10/22 12:54:27 UTC

git commit: updated refs/heads/master to 770bfe4

Updated Branches:
  refs/heads/master c0c46268a -> 770bfe435


CLOUDSTACK-3583: Fix for Management server stop is not removing the PID


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/770bfe43
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/770bfe43
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/770bfe43

Branch: refs/heads/master
Commit: 770bfe43542fea0f25fda2fab026361e7c701a5b
Parents: c0c4626
Author: Saksham Srivastava <sa...@citrix.com>
Authored: Fri Oct 11 16:34:49 2013 +0530
Committer: Rajesh Battala <ra...@citrix.com>
Committed: Tue Oct 22 16:20:51 2013 +0530

----------------------------------------------------------------------
 packaging/centos63/cloud-management.rc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/770bfe43/packaging/centos63/cloud-management.rc
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud-management.rc b/packaging/centos63/cloud-management.rc
index 35f31b2..2f04793 100755
--- a/packaging/centos63/cloud-management.rc
+++ b/packaging/centos63/cloud-management.rc
@@ -57,6 +57,8 @@ stop() {
 		done
 		if [ "$(ps --pid $pid | grep -c $pid)" -eq "0" ]; then
 			log_success_msg "Stopping ${NAME}:"
+			rm -f /var/run/${NAME}.pid
+			rm -f /var/lock/subsys/${NAME}
 		else
 			log_failure_msg "Stopping ${NAME}:"
 		fi
@@ -77,7 +79,7 @@ set_ulimit() {
 }
 
 handle_pid_file() {
-    if [ "$1" -ne 0 ] ; then
+     if [ "$1" -ne 0 ] && [ "$1" -ne 3 ]; then
         echo "The pid file locates at /var/run/${NAME}.pid and lock file at /var/lock/subsys/${NAME}.
         Starting ${NAME} will take care of them or you can manually clean up."
     fi