[SCM] CTDB repository - branch master updated - ctdb-1.0.79-13-g9434330

[Ronnie Sahlberg]

The branch, master has been updated
       via  94343309992929a592348c936e09a7b4f8b512c1 (commit)
      from  bf8dae63d10498e6b6179bbacdd72f1ff0fc60be (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 94343309992929a592348c936e09a7b4f8b512c1
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Apr 30 17:38:30 2009 +1000

    dont unconditionally kill/restart ctdb when given "service ctdb start"   only start ctdb if it is not already running,   and print an error message othervise

-----------------------------------------------------------------------

Summary of changes:
 config/ctdb.init |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/ctdb.init b/config/ctdb.init
index 0903c91..a45babf 100755
--- a/config/ctdb.init
+++ b/config/ctdb.init
@@ -95,9 +95,15 @@ set_retval() {
 }
 
 start() {
-        killall -q ctdbd
 	echo -n $"Starting ctdbd service: "
 
+	ctdb ping >& /dev/null
+	if [ $? == "0" ] ; then
+		echo $"CTDB is already running"
+		RETVAL=1
+		return $RETVAL
+        fi
+
 	# check all persistent databases that they look ok
 	PERSISTENT_DB_DIR="/var/ctdb/persistent"
 	[ -z "$CTDB_DBDIR" ] || {


-- 
CTDB repository