ctdb-scripts: Drop broken wrapper code that uses PID

The code has been broken since commit
4b652c1527afe7eff4075c95946abfa114d74015.

If ctdbd isn't all the way up in time just make a basic attempt to
shut it down.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/config/ctdbd_wrapper b/ctdb/config/ctdbd_wrapper
index a9587864f5b1a277506f4a33bf5637faa29767eb..a507f489bccaa9b7ffea7d771dc53ceb63c8789a 100755 (executable)
--- a/ctdb/config/ctdbd_wrapper
+++ b/ctdb/config/ctdbd_wrapper
@@ -222,7 +222,6 @@ start()
     eval "$ctdbd" "$ctdb_options" || return 1
 
     # Wait until ctdbd has started and is ready to respond to clients.
-    _pid=""
     _timeout="${CTDB_STARTUP_TIMEOUT:-10}"
     _count=0
     while [ "$_count" -lt "$_timeout" ] ; do
@@ -234,8 +233,9 @@ start()
        sleep 1
     done
 
-    echo "Timed out waiting for initialisation - check logs - killing CTDB"
-    kill_ctdbd "$_pid"
+    echo "Timed out waiting for initialisation - check logs"
+    # Attempt a shutdown just in case things are still running
+    $CTDB shutdown >/dev/null 2>&1
     drop_all_public_ips >/dev/null 2>&1
     return 1
 }