summaryrefslogtreecommitdiffstats
path: root/ctdb/tests
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2013-11-28 17:26:09 +1100
committerMichael Adam <obnox@samba.org>2013-12-05 00:41:25 +0100
commit85a711f5a8e9aaea42595cc53998a250b0ff6469 (patch)
tree3180664abc31cb105ad782caafd9ee90faffaf02 /ctdb/tests
parenta3fd8ddf3586f5e255df181d9b4e998f3c85e928 (diff)
downloadsamba-85a711f5a8e9aaea42595cc53998a250b0ff6469.tar.gz
samba-85a711f5a8e9aaea42595cc53998a250b0ff6469.tar.xz
samba-85a711f5a8e9aaea42595cc53998a250b0ff6469.zip
ctdb/tests/integration: Remove some unused functions
This was the start of some refactorisation that was never completed. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'ctdb/tests')
-rw-r--r--ctdb/tests/scripts/integration.bash43
1 files changed, 0 insertions, 43 deletions
diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index e9e3b1b36ea..446c663bee3 100644
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -449,13 +449,6 @@ _restart_ctdb ()
fi
}
-_ctdb_start ()
-{
- _ctdb_hack_options "$@"
-
- /etc/init.d/ctdb start
-}
-
setup_ctdb ()
{
if [ -n "$CTDB_NODES_SOCKETS" ] ; then
@@ -463,42 +456,6 @@ setup_ctdb ()
fi
}
-# Common things to do after starting one or more nodes.
-_ctdb_start_post ()
-{
- onnode -q 1 $CTDB_TEST_WRAPPER wait_until_healthy || return 1
-
- echo "Setting RerecoveryTimeout to 1"
- onnode -pq all "$CTDB setvar RerecoveryTimeout 1"
-
- # In recent versions of CTDB, forcing a recovery like this blocks
- # until the recovery is complete. Hopefully this will help the
- # cluster to stabilise before a subsequent test.
- echo "Forcing a recovery..."
- onnode -q 0 $CTDB recover
- sleep_for 1
-
- echo "ctdb is ready"
-}
-
-# This assumes that ctdbd is not running on the given node.
-ctdb_start_1 ()
-{
- local pnn="$1"
- shift # "$@" is passed to ctdbd start.
-
- echo -n "Starting CTDB on node ${pnn}..."
-
- if [ -n "$CTDB_NODES_SOCKETS" ] ; then
- daemons_start_1 $pnn "$@"
- else
- onnode $pnn $CTDB_TEST_WRAPPER _ctdb_start "$@"
- fi
-
- # If we're starting only 1 node then we're doing something weird.
- ctdb_restart_when_done
-}
-
restart_ctdb ()
{
# "$@" is passed to ctdbd start.