From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11697 invoked by alias); 31 Mar 2008 17:34:27 -0000 Received: (qmail 11648 invoked by uid 9476); 31 Mar 2008 17:34:23 -0000 Date: Mon, 31 Mar 2008 17:34:00 -0000 Message-ID: <20080331173422.11633.qmail@sourceware.org> From: lhh@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, master, updated. gfs-kernel_0_1_22-111-gce24486 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 543a08056e9f2d6189d1b85242343fb2fe6bf75b X-Git-Newrev: ce24486a968d36e3c7852ba02a38384929ca809a 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: 2008-q1/txt/msg00408.txt.bz2 This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=ce24486a968d36e3c7852ba02a38384929ca809a The branch, master has been updated via ce24486a968d36e3c7852ba02a38384929ca809a (commit) via 04461948958ab1a505b66decd5221b389e27f22b (commit) via 2b6e388e72e6a35f2133c98a714dc49ab747cf80 (commit) from 543a08056e9f2d6189d1b85242343fb2fe6bf75b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ce24486a968d36e3c7852ba02a38384929ca809a Author: Lon Hohberger Date: Fri Mar 7 14:26:50 2008 -0500 [CMAN] Make cman init script start qdiskd intelligently Resolves qdiskd/cman start ordering so gfs file systems are mounted reliably in 1-node+qdisk boot situations. commit 04461948958ab1a505b66decd5221b389e27f22b Author: Lon Hohberger Date: Mon Mar 31 11:11:33 2008 -0400 Revert "[CMAN] Make cman init script start qdiskd intelligently" This reverts commit 2b6e388e72e6a35f2133c98a714dc49ab747cf80. Need review. commit 2b6e388e72e6a35f2133c98a714dc49ab747cf80 Author: Lon Hohberger Date: Fri Mar 7 14:26:50 2008 -0500 [CMAN] Make cman init script start qdiskd intelligently Resolves qdiskd/cman start ordering so gfs file systems are mounted reliably in 1-node+qdisk boot situations. ----------------------------------------------------------------------- Summary of changes: cman/init.d/cman.in | 32 ++++++++++++++++++++++++++++++++ cman/init.d/qdiskd | 21 +++++++++++++++++++-- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index e357934..a08d4dd 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -107,6 +107,35 @@ start_cman() return 0 } + +start_qdiskd() +{ + declare current_runlevel + + current_runlevel=$(/sbin/runlevel 2>/dev/null | awk '{ print $2 }' 2>/dev/null) + # + # Start qdiskd before fenced to resolve bug #436381. This only + # happens if qdiskd is configured to run in the runlevel we are in + # + /sbin/chkconfig --levels "$current_runlevel" qdiskd 2>/dev/null + if [ $? -ne 0 ]; then + # qdiskd doesn't start at this runlevel. + return 0 + fi + + echo -n " Starting qdiskd... " + /sbin/service qdiskd start &> /dev/null + if [ $? -eq 0 ] + then + echo "done" + else + echo "failed" + return 1 + fi + return 0 +} + + start_daemons() { status groupd &> /dev/null @@ -294,6 +323,9 @@ start() echo "failed" return 1 fi + + start_qdiskd + echo -n " Starting daemons... " start_daemons if [ $? -eq 0 ] diff --git a/cman/init.d/qdiskd b/cman/init.d/qdiskd index f1c02aa..0a2c97a 100755 --- a/cman/init.d/qdiskd +++ b/cman/init.d/qdiskd @@ -19,9 +19,26 @@ retries=0 # See how we were called. case "$1" in start) - action "Starting the Quorum Disk Daemon:" qdiskd -Q + echo -n "Starting the Quorum Disk Daemon:" + + $0 status >/dev/null + if [ $? -eq 0 ]; then + echo_success + echo + exit 0 + fi + + qdiskd -Q rtrn=$? - [ $rtrn = 0 ] && touch $LOCK_FILE + if [ $rtrn = 0 ]; then + touch $LOCK_FILE + echo_success + echo + else + echo_failure + echo + fi + ;; stop) hooks/post-receive -- Cluster Project