[Pkg-samba-maint] r2024 - trunk/ctdb/debian

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-07-10 19:56:35 +0000 (Thu, 10 Jul 2008)
New Revision: 2024

Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/ctdb.init
Log:
 added CTDB_VALGRIND option to ctdb.init (from 1.0.43)


Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2008-07-08 19:39:34 UTC (rev 2023)
+++ trunk/ctdb/debian/changelog	2008-07-10 19:56:35 UTC (rev 2024)
@@ -1,11 +1,12 @@
-ctdb (1.0.42+git200806270931-1) UNRELEASED; urgency=low
+ctdb (1.0.42+git200807041658-1) UNRELEASED; urgency=low
 
   * New upstream git snapshot
+    * added CTDB_VALGRIND option to ctdb.init (from 1.0.43)
   * Bump standards version to 3.8.0 (no changes needed)
   * Remove patch 04_install_chmod, applied upstream
     (see https://bugzilla.samba.org/show_bug.cgi?id=5216)
 
- -- Mathieu Parent <math.parent at gmail.com>  Sat, 28 Jun 2008 00:57:17 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Thu, 10 Jul 2008 21:49:37 +0200
 
 ctdb (1.0.42+git200806131353-1) unstable; urgency=low
 

Modified: trunk/ctdb/debian/ctdb.init
===================================================================
--- trunk/ctdb/debian/ctdb.init	2008-07-08 19:39:34 UTC (rev 2023)
+++ trunk/ctdb/debian/ctdb.init	2008-07-10 19:56:35 UTC (rev 2024)
@@ -124,7 +124,10 @@
                 }
         done
         # Start the process using the wrapper
-        if [ -z "$DAEMONUSER" ] ; then
+        if [ "$CTDB_VALGRIND" = "yes" ]; then
+	    valgrind -q --log-file=/var/log/ctdb_valgrind \
+		$DAEMON --nosetsched $CTDB_OPTIONS 
+	else if [ -z "$DAEMONUSER" ] ; then
             start-stop-daemon --start --quiet --background \
                         --exec $DAEMON -- $CTDB_OPTIONS
             errcode=$?
@@ -135,6 +138,7 @@
                         --exec $DAEMON -- $CTDB_OPTIONS
             errcode=$?
         fi
+	fi
 	sleep 1
 	# set any tunables from the config file
 	set | grep ^CTDB_SET_ | cut -d_ -f3- | 
@@ -150,7 +154,11 @@
 # Stop the process using the wrapper
         ctdb shutdown
 	errcode=$?
-	if [ -z "$DAEMONUSER" ] ; then
+        if [ "$CTDB_VALGRIND" = "yes" ]; then
+	    # very crude method
+	    sleep 2
+	    pkill -9 -f valgrind
+	else if [ -z "$DAEMONUSER" ] ; then
             start-stop-daemon --stop --quiet \
                         --exec $DAEMON
             errcode=$?
@@ -161,6 +169,7 @@
                         --exec $DAEMON
             errcode=$?
         fi
+	fi
 	count=0
 	while killall -q -0 ctdbd; do
 	    sleep 1