From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3664 invoked by alias); 31 Mar 2009 08:54:27 -0000 Received: (qmail 3658 invoked by alias); 31 Mar 2009 08:54:27 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: cluster: STABLE3 - cman init: wait for qdiskd to be active To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 9824f903278d948ee2cbe330a7e52ce1d1cf2093 X-Git-Newrev: b8fc4036cf0cc45c9fd4ea3264242d07cbec00dd From: "Fabio M. Di Nitto" Message-Id: <20090331085402.B5F53120360@lists.fedorahosted.org> Date: Tue, 31 Mar 2009 08:54:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q1/txt/msg00986.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b8fc4036cf0cc45c9fd4ea3264242d07cbec00dd Commit: b8fc4036cf0cc45c9fd4ea3264242d07cbec00dd Parent: 9824f903278d948ee2cbe330a7e52ce1d1cf2093 Author: Fabio M. Di Nitto AuthorDate: Tue Mar 31 10:53:17 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Tue Mar 31 10:53:17 2009 +0200 cman init: wait for qdiskd to be active check for qdiskd startup. make sure it talks to cman and report errors if it crashes or exits. Signed-off-by: Fabio M. Di Nitto --- cman/init.d/cman.in | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index e30f500..d46c98c 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -480,7 +480,23 @@ unfence_self() start_qdiskd() { - start_daemon qdiskd "-Q" + start_daemon qdiskd "-Q" || return 1 + + if [ "$INITLOGLEVEL" = "full" ]; then + ok + echo -n " Waiting for qdiskd to be active: " + fi + retries=0 + while ! cman_tool status |grep -q "Quorum device" && \ + status qdiskd > /dev/null 2>&1 && \ + [ $retries -lt 10 ]; do + sleep 2 + if [ "$INITLOGLEVEL" = "full" ]; then + echo -n "$retries " + fi + ((retries++)) + done + status qdiskd > /dev/null 2>&1 } stop_qdiskd()