From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5161 invoked by alias); 18 Aug 2009 07:59:23 -0000 Received: (qmail 5150 invoked by alias); 18 Aug 2009 07:59:23 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 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 bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - cman init: don't wait for quorum twice 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: ce1d15f96aed3e37872d9f8e1d6e70aa0865f7e4 X-Git-Newrev: bec3b293d71404d64976a7da223435e98a969769 From: "Fabio M. Di Nitto" Message-Id: <20090818075859.E1D8212033E@lists.fedorahosted.org> Date: Tue, 18 Aug 2009 07:59: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-q3/txt/msg00213.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=bec3b293d71404d64976a7da223435e98a969769 Commit: bec3b293d71404d64976a7da223435e98a969769 Parent: ce1d15f96aed3e37872d9f8e1d6e70aa0865f7e4 Author: Fabio M. Di Nitto AuthorDate: Tue Aug 18 09:58:05 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Tue Aug 18 09:58:05 2009 +0200 cman init: don't wait for quorum twice with the newly introduced check for quorum after qdiskd, there is no point to wait in cman startup anymore since qdiskd might be the quorum provider. Signed-off-by: Fabio M. Di Nitto --- cman/init.d/cman.in | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index ff140fc..e753f7c 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -482,11 +482,6 @@ start_cman() if ! cman_running && cman_checkconfig; then errmsg=$( cman_tool -t $CMAN_CLUSTER_TIMEOUT -w join \ $cman_join_opts 2>&1 ) || return 1 - - if [ $CMAN_QUORUM_TIMEOUT -gt 0 ]; then - errmsg=$( cman_tool -t $CMAN_QUORUM_TIMEOUT \ - -q wait 2>&1 ) || return 1 - fi fi }