cluster: STABLE3 - cman init: wait for corosync daemon to exit on stop
Fabio M. Di Nitto
fabbione at fedoraproject.org
Sat May 15 06:00:40 UTC 2010
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b41e5e2a73b8777c26dc51fd1e805bad51eb3203
Commit: b41e5e2a73b8777c26dc51fd1e805bad51eb3203
Parent: 7dc421cbf11fcec7de9f73266cef70a54a13cb8c
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
AuthorDate: Sat May 15 07:59:24 2010 +0200
Committer: Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Sat May 15 07:59:24 2010 +0200
cman init: wait for corosync daemon to exit on stop
corosync could take time to exit after a shutdown/stop process is started.
The correct init script behavior is to wait for the daemon to exit.
Resolves: rhbz#592103
Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
cman/init.d/cman.in | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index e0281be..b7eba95 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -565,7 +565,14 @@ stop_cman()
if cman_running; then
errmsg=$( cman_tool $cman_leave_opts -t $CMAN_SHUTDOWN_TIMEOUT \
-w leave $cmanremove 2>&1 ) || return 1
+ ok
+ echo -n " Waiting for corosync to shutdown:"
+ while status corosync > /dev/null 2>&1; do
+ sleep 1
+ echo -n "."
+ done
fi
+ return 0
}
start_qdiskd()
More information about the cluster-commits
mailing list