Merge lp:~trond-norbye/drizzle/memcached-startup into lp:~drizzle-trunk/drizzle/development

[Trond Norbye]

[Trond Norbye (trond-norbye)]

Fix the startup script for the memcached server to run the binary we detected during configure

=== modified file '.bzrignore'
--- .bzrignore	2009-12-05 00:32:01 +0000
+++ .bzrignore	2009-12-17 11:06:14 +0000
@@ -109,6 +109,7 @@
 plugin/archive/archive_reader
 plugin/archive/archive_test
 plugin/archive/concurrency_test
+plugin/memcached_functions/tests/start_mc.sh
 plugin/myisam/myisamchk
 plugin/myisam/myisamlog
 plugin/myisam/myisampack

=== modified file 'plugin/memcached_functions/plugin.ac'
--- plugin/memcached_functions/plugin.ac	2009-11-21 01:47:03 +0000
+++ plugin/memcached_functions/plugin.ac	2009-12-17 11:06:14 +0000
@@ -3,3 +3,4 @@
 AS_IF([test "x$ac_cv_libmemcached" = "xno" -a "x${MEMCACHED_BINARY}" = "xyes"],
       AC_MSG_WARN([libmemcached not found: not building memcached_functions plugin.]))
 DRIZZLED_PLUGIN_DEP_LIBS="${DRIZZLED_PLUGIN_DEP_LIBS} ${LTLIBMEMCACHED}"
+AC_CONFIG_FILES([plugin/memcached_functions/tests/start_mc.sh])

=== removed file 'plugin/memcached_functions/tests/start_mc.sh'
--- plugin/memcached_functions/tests/start_mc.sh	2009-10-16 21:01:42 +0000
+++ plugin/memcached_functions/tests/start_mc.sh	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-#! /bin/sh
-
-PORT=19191
-if [ $MC_PORT ]; then
-  PORT=$MC_PORT
-fi
-
-USER=nobody
-MAXCONN=1024
-CACHESIZE=1024
-OPTIONS=""
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:$PATH
-RETVAL=0
-
-start () {
-	memcached -d -p $PORT -u $USER -m $CACHESIZE -c $MAXCONN -U 0
-	RETVAL=$?
-}
-stop () {
-	PIDS=`ps -ef | grep memcached | grep $PORT | grep $USER | grep -v grep | awk '{print $2}'`
-	if test "x${PIDS}" != "x"
-	then
-		echo "${PIDS}" | xargs -n1 kill -9
-	        RETVAL=$?
-	fi
-}
-
-restart () {
-        stop
-        start
-}
-
-
-# See how we were called.
-case "$1" in
-  start)
-        start
-        ;;
-  stop)
-        stop
-        ;;
-  restart|reload)
-        restart
-        ;;
-  *)
-        echo $"Usage: $0 {start|stop|restart|reload}"
-        exit 1
-esac
-
-exit $?
-

=== added file 'plugin/memcached_functions/tests/start_mc.sh.in'
--- plugin/memcached_functions/tests/start_mc.sh.in	1970-01-01 00:00:00 +0000
+++ plugin/memcached_functions/tests/start_mc.sh.in	2009-12-17 11:06:14 +0000
@@ -0,0 +1,50 @@
+#! /bin/sh
+
+PORT=19191
+if [ $MC_PORT ]; then
+  PORT=$MC_PORT
+fi
+
+MAXCONN=1024
+CACHESIZE=1024
+OPTIONS=""
+
+startup()
+{
+  @MEMCACHED_BINARY@ -d -p $PORT -m $CACHESIZE -c $MAXCONN -U 0 -P /tmp/memc.pid.$PORT
+}
+
+shutdown()
+{
+  if [ -f /tmp/memc.pid.$PORT ]
+  then
+    kill -9 `cat /tmp/memc.pid.$PORT`
+    rm /tmp/memc.pid.$PORT
+  fi
+}
+
+restart()
+{
+  shutdown
+  startup
+}
+
+
+# See how we were called.
+case "$1" in
+  start)
+        startup
+        ;;
+  stop)
+        shutdown
+        ;;
+  restart|reload)
+        restart
+        ;;
+  *)
+        echo $"Usage: $0 {start|stop|restart|reload}"
+        exit 1
+esac
+
+exit $?
+

=== modified file 'plugin/memcached_functions/tests/t/memc.test'
--- plugin/memcached_functions/tests/t/memc.test	2009-12-04 18:50:04 +0000
+++ plugin/memcached_functions/tests/t/memc.test	2009-12-17 11:06:14 +0000
@@ -1,7 +1,7 @@
 # we are assuming the memcached binary is contained in PATH or
 # common directories we might expect it to be in
---exec $DRIZZLE_TEST_DIR/../plugin/memcached_functions/tests/start_mc.sh stop
---exec $DRIZZLE_TEST_DIR/../plugin/memcached_functions/tests/start_mc.sh start
+--exec sh $DRIZZLE_TEST_DIR/../plugin/memcached_functions/tests/start_mc.sh stop
+--exec sh $DRIZZLE_TEST_DIR/../plugin/memcached_functions/tests/start_mc.sh start
 
 DROP TABLE IF EXISTS `t1`;
 --replace_result $MC_PORT MC_A_PORT
@@ -193,5 +193,5 @@
 select memc_behavior_get('MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK');
 select memc_behavior_set('MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK', @size);
 
---exec $DRIZZLE_TEST_DIR/../plugin/memcached_functions/tests/start_mc.sh stop
+--exec sh $DRIZZLE_TEST_DIR/../plugin/memcached_functions/tests/start_mc.sh stop