diff options
Diffstat (limited to 'ctdb/tests')
| -rw-r--r-- | ctdb/tests/1node.txt | 2 | ||||
| -rw-r--r-- | ctdb/tests/4nodes.txt | 8 | ||||
| -rwxr-xr-x | ctdb/tests/bench-ssh.sh | 2 | ||||
| -rwxr-xr-x | ctdb/tests/bench.sh | 2 | ||||
| -rwxr-xr-x | ctdb/tests/fetch.sh | 2 | ||||
| -rwxr-xr-x | ctdb/tests/messaging.sh | 2 | ||||
| -rw-r--r-- | ctdb/tests/nodes.txt | 5 | ||||
| -rwxr-xr-x | ctdb/tests/recover.sh | 6 | ||||
| -rwxr-xr-x | ctdb/tests/test.sh | 2 |
9 files changed, 16 insertions, 15 deletions
diff --git a/ctdb/tests/1node.txt b/ctdb/tests/1node.txt index db4350c0c0..7b9ad531d2 100644 --- a/ctdb/tests/1node.txt +++ b/ctdb/tests/1node.txt @@ -1 +1 @@ -127.0.0.1:9001 +127.0.0.1 diff --git a/ctdb/tests/4nodes.txt b/ctdb/tests/4nodes.txt index 880fe914ff..99b07328b3 100644 --- a/ctdb/tests/4nodes.txt +++ b/ctdb/tests/4nodes.txt @@ -1,4 +1,4 @@ -127.0.0.1:9001 -127.0.0.2:9001 -127.0.0.3:9001 -127.0.0.4:9001 +127.0.0.1 +127.0.0.2 +127.0.0.3 +127.0.0.4 diff --git a/ctdb/tests/bench-ssh.sh b/ctdb/tests/bench-ssh.sh index 8716156e3a..92f81a7297 100755 --- a/ctdb/tests/bench-ssh.sh +++ b/ctdb/tests/bench-ssh.sh @@ -18,7 +18,7 @@ echo "Creating nodes-ssh.txt" rm -f nodes-ssh.txt count=0 for h in $nodes; do - echo "$h:9001" >> nodes-ssh.txt + echo "$h" >> nodes-ssh.txt count=`expr $count + 1` done diff --git a/ctdb/tests/bench.sh b/ctdb/tests/bench.sh index f9430919ea..74d8785bcb 100755 --- a/ctdb/tests/bench.sh +++ b/ctdb/tests/bench.sh @@ -9,7 +9,7 @@ fi rm -f nodes.txt for i in `seq 1 $NUMNODES`; do - echo 127.0.0.$i:9001 >> nodes.txt + echo 127.0.0.$i >> nodes.txt done killall -9 ctdb_bench diff --git a/ctdb/tests/fetch.sh b/ctdb/tests/fetch.sh index fb384e2935..a17dc76e05 100755 --- a/ctdb/tests/fetch.sh +++ b/ctdb/tests/fetch.sh @@ -7,7 +7,7 @@ fi rm -f nodes.txt for i in `seq 1 $NUMNODES`; do - echo 127.0.0.$i:9001 >> nodes.txt + echo 127.0.0.$i >> nodes.txt done killall -9 ctdb_fetch diff --git a/ctdb/tests/messaging.sh b/ctdb/tests/messaging.sh index 07ca2ca5c9..ab8cfcfd49 100755 --- a/ctdb/tests/messaging.sh +++ b/ctdb/tests/messaging.sh @@ -11,7 +11,7 @@ fi rm -f nodes.txt for i in `seq 1 $NUMNODES`; do - echo 127.0.0.$i:9001 >> nodes.txt + echo 127.0.0.$i >> nodes.txt done killall -9 ctdb_messaging diff --git a/ctdb/tests/nodes.txt b/ctdb/tests/nodes.txt index e1198b59ac..876f0c241a 100644 --- a/ctdb/tests/nodes.txt +++ b/ctdb/tests/nodes.txt @@ -1,2 +1,3 @@ -127.0.0.1:9001 -127.0.0.2:9001 +127.0.0.1 +127.0.0.2 + diff --git a/ctdb/tests/recover.sh b/ctdb/tests/recover.sh index e89ca6d156..99f81eb911 100755 --- a/ctdb/tests/recover.sh +++ b/ctdb/tests/recover.sh @@ -4,9 +4,9 @@ killall -q ctdbd echo "Starting 4 ctdb daemons" bin/ctdbd --recovery-daemon --nlist direct/4nodes.txt -bin/ctdbd --recovery-daemon --nlist direct/4nodes.txt --listen=127.0.0.2:9001 --socket=/tmp/ctdb.socket.127.0.0.2 -bin/ctdbd --recovery-daemon --nlist direct/4nodes.txt --listen=127.0.0.3:9001 --socket=/tmp/ctdb.socket.127.0.0.3 -bin/ctdbd --recovery-daemon --nlist direct/4nodes.txt --listen=127.0.0.4:9001 --socket=/tmp/ctdb.socket.127.0.0.4 +bin/ctdbd --recovery-daemon --nlist direct/4nodes.txt --listen=127.0.0.2 --socket=/tmp/ctdb.socket.127.0.0.2 +bin/ctdbd --recovery-daemon --nlist direct/4nodes.txt --listen=127.0.0.3 --socket=/tmp/ctdb.socket.127.0.0.3 +bin/ctdbd --recovery-daemon --nlist direct/4nodes.txt --listen=127.0.0.4 --socket=/tmp/ctdb.socket.127.0.0.4 echo echo "Attaching to some databases" diff --git a/ctdb/tests/test.sh b/ctdb/tests/test.sh index c243dbd032..0a6e3779b4 100755 --- a/ctdb/tests/test.sh +++ b/ctdb/tests/test.sh @@ -12,7 +12,7 @@ fi rm -f nodes.txt for i in `seq 1 $NUMNODES`; do - echo 127.0.0.$i:9001 >> nodes.txt + echo 127.0.0.$i >> nodes.txt done killall -9 ctdb_test |