This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: STABLE3 - init: stop daemons before cman
- From: "Fabio M. Di Nitto" <fabbione at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Mon, 2 Mar 2009 08:35:12 +0000 (UTC)
- Subject: cluster: STABLE3 - init: stop daemons before cman
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=9824740ddabbfebbed33e43244b089e528539a8e
Commit: 9824740ddabbfebbed33e43244b089e528539a8e
Parent: 3e114a01e96eae78aa58e11f82f371e30215c3e7
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate: Mon Mar 2 09:25:36 2009 +0100
Committer: Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Mon Mar 2 09:25:36 2009 +0100
init: stop daemons before cman
commit b263da25536c90e6ca654a0be6e64481fe31eba2 did the right thing
at that time, but it should have been updated in time with the evolution
of the rest of the stack.
At stop/shutdown time, fence_tool/fenced will now refuse to stop if
there is an active mount and therefor the init script will not continue
as it used to do before.
As a consequence, with a clean shutdown operation, all daemons will now
release the resources and not leak ipc resources.
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
cman/init.d/cman.in | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index 9d258f3..ce22818 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -691,6 +691,17 @@ stop()
fi
fi
+ echo -n " Stopping daemons... "
+ stop_daemons
+ [ $? -ne 0 ]
+ if [ $? -eq 0 ]
+ then
+ echo "done"
+ else
+ echo "failed"
+ return 1
+ fi
+
echo -n " Stopping cman... "
if [ $1 ]; then
stop_cman $1
@@ -715,9 +726,6 @@ stop()
return 1
fi
-# stop_daemons
-# [ $? -ne 0 ] && return 1
-
echo -n " Stopping ccsd... "
stop_ccsd
if [ $? -eq 0 ]