hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chaged MaxScale default installation directory to /usr/local/mariadb/maxscale and MaxAdmin password to 'mariadb'.

Browse Source
This commit is contained in:
Markus Makela
2015-03-23 14:53:31 +02:00
parent 1680337f40
commit 7cfc1d3cc9
36 changed files with 148 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/test/maxadmin_stress.sh
View File

@ -9,14 +9,14 @@ echo Running $clients parallel iterations of $cmdcnt commands
for ((cnt=0; cnt<$clients; cnt++ )); do
for ((i=0; i<$cmdcnt; i++ )); do
maxadmin -pskysql show services;
maxadmin -pmariadb show services;
done >/dev/null &
done >& /dev/null
peak=0
while [ "`jobs -p`" != "" ]; do
jobs >& /dev/null
zombies=`maxadmin -pskysql list dcbs | grep -ci zombies`
zombies=`maxadmin -pmariadb list dcbs | grep -ci zombies`
if [ $zombies -gt $peak ] ; then
peak=$zombies
fi
@ -29,7 +29,7 @@ else
passed=`expr $passed + 1`
echo "Zombie collection ($peak): Passed"
fi
zombies=`maxadmin -pskysql list dcbs | grep -ci zombies`
zombies=`maxadmin -pmariadb list dcbs | grep -ci zombies`
if [ $zombies != "0" ]; then
echo "Residual zombie DCBs: Failed"
failure=`expr $failure + 1`
@ -37,7 +37,7 @@ else
passed=`expr $passed + 1`
echo "Residual zombie DCBs: Passed"
fi
sessions=`maxadmin -pskysql list services | awk -F\| '/ cli/ { print $3 }'`
sessions=`maxadmin -pmariadb list services | awk -F\| '/ cli/ { print $3 }'`
if [ $sessions -gt 3 ]; then
echo "Session shutdown, $sessions: Failed"
failure=`expr $failure + 1`
@ -46,7 +46,7 @@ else
echo "Session shutdown: Passed"
fi
sessions=`maxadmin -pskysql list services | awk -F\| '/ cli/ { print $4 }'`
sessions=`maxadmin -pmariadb list services | awk -F\| '/ cli/ { print $4 }'`
echo "Test run complete. $passed passes, $failure failures"
echo "$sessions CLI sessions executed"

92
client/test/maxadmin_test.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh
failure=0
passed=0
maxadmin -pskysql help >& /dev/null
maxadmin -pmariadb help >& /dev/null
if [ $? -eq "1" ]; then
echo "Auth test (correct password): Failed"
failure=`expr $failure + 1`
@ -17,7 +17,7 @@ else
passed=`expr $passed + 1`
echo "Auth test (wrong password): Passed"
fi
maxadmin --password=skysql help >& /dev/null
maxadmin --password=mariadb help >& /dev/null
if [ $? -eq "1" ]; then
echo "Auth test (long option): Failed"
failure=`expr $failure + 1`
@ -33,7 +33,7 @@ for op in enable disable
do
for cmd in heartbeat root
do
maxadmin -pskysql $op $cmd >& /dev/null
maxadmin -pmariadb $op $cmd >& /dev/null
if [ $? -eq "1" ]; then
echo "$op $cmd (missing arg): Failed"
failure=`expr $failure + 1`
@ -42,7 +42,7 @@ do
echo "$op $cmd (missing arg): Passed"
fi
maxadmin -pskysql $op $cmd qwerty >& /dev/null
maxadmin -pmariadb $op $cmd qwerty >& /dev/null
if [ $? -eq "1" ]; then
echo "$op $cmd (invalid arg): Failed"
failure=`expr $failure + 1`
@ -51,7 +51,7 @@ do
echo "$op $cmd (invalied arg): Passed"
fi
maxadmin -pskysql $op $cmd xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx >& /dev/null
maxadmin -pmariadb $op $cmd xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx >& /dev/null
if [ $? -eq "1" ]; then
echo "$op $cmd (long invalid arg): Failed"
failure=`expr $failure + 1`
@ -65,7 +65,7 @@ done
#
# Test reload dbusers with short, and long garbage and without argument
#
maxadmin -pskysql reload dbusers qwerty >& /dev/null
maxadmin -pmariadb reload dbusers qwerty >& /dev/null
if [ $? -eq "1" ]; then
echo "Reload dbusers (invalid arg): Failed"
failure=`expr $failure + 1`
@ -74,7 +74,7 @@ else
echo "Reload dbusers (invalid arg): Passed"
fi
maxadmin -pskysql reload dbusers xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx >& /dev/null
maxadmin -pmariadb reload dbusers xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx >& /dev/null
if [ $? -eq "1" ]; then
echo "Reload dbusers (long invalid arg): Failed"
failure=`expr $failure + 1`
@ -84,7 +84,7 @@ else
fi
maxadmin -pskysql reload dbusers >& /dev/null
maxadmin -pmariadb reload dbusers >& /dev/null
if [ $? -eq "1" ]; then
echo "Reload dbusers (missing arg): Failed"
failure=`expr $failure + 1`
@ -96,7 +96,7 @@ fi
#
# Test enable|disable log debug|trace|message|error
#
maxadmin -pskysql enable log debug >& /dev/null
maxadmin -pmariadb enable log debug >& /dev/null
if [ $? -eq "1" ]; then
echo "Enable debug log: Failed"
failure=`expr $failure + 1`
@ -105,7 +105,7 @@ else
echo "Enable debug log: Passed"
fi
maxadmin -pskysql enable log trace >& /dev/null
maxadmin -pmariadb enable log trace >& /dev/null
if [ $? -eq "1" ]; then
echo "Enable trace log: Failed"
failure=`expr $failure + 1`
@ -114,7 +114,7 @@ else
echo "Enable trace log: Passed"
fi
maxadmin -pskysql enable log message >& /dev/null
maxadmin -pmariadb enable log message >& /dev/null
if [ $? -eq "1" ]; then
echo "Enable message log: Failed"
failure=`expr $failure + 1`
@ -123,7 +123,7 @@ else
echo "Enable message log: Passed"
fi
maxadmin -pskysql enable log error >& /dev/null
maxadmin -pmariadb enable log error >& /dev/null
if [ $? -eq "1" ]; then
echo "Enable error log: Failed"
failure=`expr $failure + 1`
@ -134,7 +134,7 @@ fi
maxadmin -pskysql disable log debug >& /dev/null
maxadmin -pmariadb disable log debug >& /dev/null
if [ $? -eq "1" ]; then
echo "Disable debug log: Failed"
failure=`expr $failure + 1`
@ -143,7 +143,7 @@ else
echo "Disable debug log: Passed"
fi
maxadmin -pskysql disable log trace >& /dev/null
maxadmin -pmariadb disable log trace >& /dev/null
if [ $? -eq "1" ]; then
echo "Disable trace log: Failed"
failure=`expr $failure + 1`
@ -157,7 +157,7 @@ fi
#
for cmd in monitor service
do
maxadmin -pskysql restart $cmd >& /dev/null
maxadmin -pmariadb restart $cmd >& /dev/null
if [ $? -eq "1" ]; then
echo "Restart $cmd (missing arg): Failed"
failure=`expr $failure + 1`
@ -166,7 +166,7 @@ do
echo "Restart $cmd (missing arg): Passed"
fi
maxadmin -pskysql restart $cmd xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx >& /dev/null
maxadmin -pmariadb restart $cmd xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx >& /dev/null
if [ $? -eq "1" ]; then
echo "Restart $cmd (long invalid arg): Failed"
failure=`expr $failure + 1`
@ -175,7 +175,7 @@ do
echo "Restart $cmd (long invalid arg): Passed"
fi
maxadmin -pskysql restart $cmd qwerty >& /dev/null
maxadmin -pmariadb restart $cmd qwerty >& /dev/null
if [ $? -eq "1" ]; then
echo "Restart $cmd (invalid arg): Failed"
failure=`expr $failure + 1`
@ -188,7 +188,7 @@ done
#
# Test set server qwerty master withaout, with invalid and with long invalid arg
#
maxadmin -pskysql set server qwerty >& /dev/null
maxadmin -pmariadb set server qwerty >& /dev/null
if [ $? -eq "1" ]; then
echo "Set server qwerty (missing arg): Failed"
failure=`expr $failure + 1`
@ -197,7 +197,7 @@ else
echo "Set server (missing arg): Passed"
fi
maxadmin -pskysql set server qwerty mamaster >& /dev/null
maxadmin -pmariadb set server qwerty mamaster >& /dev/null
if [ $? -eq "1" ]; then
echo "Set server qwerty (invalid arg): Failed"
failure=`expr $failure + 1`
@ -206,7 +206,7 @@ else
echo "Set server qwerty (invalid arg): Passed"
fi
maxadmin -pskysql set server qwerty xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx >& /dev/null
maxadmin -pmariadb set server qwerty xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx >& /dev/null
if [ $? -eq "1" ]; then
echo "Set server qwerty (long invalid arg): Failed"
failure=`expr $failure + 1`
@ -218,7 +218,7 @@ fi
for cmd in clients dcbs filters listeners modules monitors services servers sessions threads
do
maxadmin -pskysql list $cmd | grep -s '-' >& /dev/null
maxadmin -pmariadb list $cmd | grep -s '-' >& /dev/null
if [ $? -eq "1" ]; then
echo "list command ($cmd): Failed"
failure=`expr $failure + 1`
@ -230,7 +230,7 @@ done
for cmd in dcbs dbusers epoll filters modules monitors services servers sessions threads users
do
maxadmin -pskysql show $cmd | grep -s ' ' >& /dev/null
maxadmin -pmariadb show $cmd | grep -s ' ' >& /dev/null
if [ $? -eq "1" ]; then
echo "show command ($cmd): Failed"
failure=`expr $failure + 1`
@ -240,7 +240,7 @@ do
fi
done
master=`maxadmin -pskysql list servers | awk '/Master/ { print $1; }'`
master=`maxadmin -pmariadb list servers | awk '/Master/ { print $1; }'`
if [ $? -eq "1" ]; then
echo "Extract master server: Failed"
failure=`expr $failure + 1`
@ -255,7 +255,7 @@ else
passed=`expr $passed + 1`
echo "Get master server: Passed"
fi
maxadmin -pskysql show server $master | grep -s 'Master' >& /dev/null
maxadmin -pmariadb show server $master | grep -s 'Master' >& /dev/null
if [ $? -eq "1" ]; then
echo "show server master: Failed"
failure=`expr $failure + 1`
@ -264,7 +264,7 @@ else
echo "show server master: Passed"
fi
maxadmin -pskysql set server $master maint >& /dev/null
maxadmin -pmariadb set server $master maint >& /dev/null
if [ $? -eq "1" ]; then
echo "set server $master maint: Failed"
failure=`expr $failure + 1`
@ -273,7 +273,7 @@ else
echo "set server $master maint: Passed"
fi
maxadmin -pskysql list servers | grep $master | grep -s 'Maint' >& /dev/null
maxadmin -pmariadb list servers | grep $master | grep -s 'Maint' >& /dev/null
if [ $? -eq "1" ]; then
echo "set maintenance mode: Failed"
failure=`expr $failure + 1`
@ -282,7 +282,7 @@ else
echo "set maintenance mode: Passed"
fi
maxadmin -pskysql clear server $master maint >& /dev/null
maxadmin -pmariadb clear server $master maint >& /dev/null
if [ $? -eq "1" ]; then
echo "clear server: Failed"
failure=`expr $failure + 1`
@ -290,7 +290,7 @@ else
passed=`expr $passed + 1`
echo "clear server: Passed"
fi
maxadmin -pskysql list servers | grep $master | grep -s 'Maint' >& /dev/null
maxadmin -pmariadb list servers | grep $master | grep -s 'Maint' >& /dev/null
if [ $? -eq "0" ]; then
echo "clear maintenance mode: Failed"
failure=`expr $failure + 1`
@ -299,7 +299,7 @@ else
echo "clear maintenance mode: Passed"
fi
dcbs=`maxadmin -pskysql list dcbs | awk -F\| '/listening/ { if ( NF > 1 ) print $1 }'`
dcbs=`maxadmin -pmariadb list dcbs | awk -F\| '/listening/ { if ( NF > 1 ) print $1 }'`
if [ $? -eq "1" ]; then
echo "Get dcb listeners: Failed"
failure=`expr $failure + 1`
@ -310,7 +310,7 @@ fi
for i in $dcbs
do
maxadmin -pskysql show dcb $i | grep -s 'listening' >& /dev/null
maxadmin -pmariadb show dcb $i | grep -s 'listening' >& /dev/null
if [ $? -eq "1" ]; then
echo "show dcb listeners: Failed"
failure=`expr $failure + 1`
@ -325,7 +325,7 @@ done
#
for cmd in dcb eventq filter monitor server service sessions
do
maxadmin -pskysql show $cmd qwerty | grep -s '-' >& /dev/null
maxadmin -pmariadb show $cmd qwerty | grep -s '-' >& /dev/null
if [ $? -eq "0" ]; then
echo "show $cmd (invalid arg): Failed"
failure=`expr $failure + 1`
@ -340,7 +340,7 @@ done
#
for cmd in monitor service
do
maxadmin -pskysql shutdown $cmd qwerty | grep -s '-' >& /dev/null
maxadmin -pmariadb shutdown $cmd qwerty | grep -s '-' >& /dev/null
if [ $? -eq "0" ]; then
echo "Shutdown $cmd (invalid extra arg):Failed"
failure=`expr $failure + 1`
@ -351,7 +351,7 @@ do
done
sessions=`maxadmin -pskysql list sessions | awk -F\| '/Listener/ { if ( NF > 1 ) print $1 }'`
sessions=`maxadmin -pmariadb list sessions | awk -F\| '/Listener/ { if ( NF > 1 ) print $1 }'`
if [ $? -eq "1" ]; then
echo "Get listener sessions: Failed"
failure=`expr $failure + 1`
@ -362,7 +362,7 @@ fi
for i in $sessions
do
maxadmin -pskysql show session $i | grep -s 'Listener' >& /dev/null
maxadmin -pmariadb show session $i | grep -s 'Listener' >& /dev/null
if [ $? -eq "1" ]; then
echo "show session listeners: Failed"
failure=`expr $failure + 1`
@ -372,7 +372,7 @@ do
fi
done
filters=`maxadmin -pskysql list filters | awk -F\| '{ if ( NF > 1 ) print $1 }'| grep -v Options`
filters=`maxadmin -pmariadb list filters | awk -F\| '{ if ( NF > 1 ) print $1 }'| grep -v Options`
if [ $? -eq "1" ]; then
echo "Get Filter list: Failed"
failure=`expr $failure + 1`
@ -383,7 +383,7 @@ fi
for i in $filters
do
maxadmin -pskysql show filter $i | grep -s 'Filter' >& /dev/null
maxadmin -pmariadb show filter $i | grep -s 'Filter' >& /dev/null
if [ $? -eq "1" ]; then
echo "show filter: Failed"
failure=`expr $failure + 1`
@ -393,7 +393,7 @@ do
fi
done
maxadmin -pskysql list services | \
maxadmin -pmariadb list services | \
awk -F\| '{ if (NF > 1) { sub(/ +$/, "", $1); printf("show service \"%s\"\n", $1); } }' > script1.$$
grep -cs "show service" script1.$$ >/dev/null
if [ $? -ne "0" ]; then
@ -403,7 +403,7 @@ else
passed=`expr $passed + 1`
echo "list services: Passed"
fi
maxadmin -pskysql script1.$$ | grep -cs 'Service' > /dev/null
maxadmin -pmariadb script1.$$ | grep -cs 'Service' > /dev/null
if [ $? -ne "0" ]; then
echo "Show Service: Failed"
failure=`expr $failure + 1`
@ -414,7 +414,7 @@ fi
rm -f script1.$$
maxadmin -pskysql list monitors | \
maxadmin -pmariadb list monitors | \
awk -F\| '{ if (NF > 1) { sub(/ +$/, "", $1); printf("show monitor \"%s\"\n", $1); } }' > script1.$$
grep -cs "show monitor" script1.$$ >/dev/null
if [ $? -ne "0" ]; then
@ -424,7 +424,7 @@ else
passed=`expr $passed + 1`
echo "list monitors: Passed"
fi
maxadmin -pskysql script1.$$ | grep -cs 'Monitor' > /dev/null
maxadmin -pmariadb script1.$$ | grep -cs 'Monitor' > /dev/null
if [ $? -ne "0" ]; then
echo "Show Monitor: Failed"
failure=`expr $failure + 1`
@ -435,7 +435,7 @@ fi
rm -f script1.$$
maxadmin -pskysql list sessions | \
maxadmin -pmariadb list sessions | \
awk -F\| ' /^0x/ { if (NF > 1) { sub(/ +$/, "", $1); printf("show session \"%s\"\n", $1); } }' > script1.$$
grep -cs "show session" script1.$$ >/dev/null
if [ $? -ne "0" ]; then
@ -445,7 +445,7 @@ else
passed=`expr $passed + 1`
echo "list sessions: Passed"
fi
maxadmin -pskysql script1.$$ | grep -cs 'Session' > /dev/null
maxadmin -pmariadb script1.$$ | grep -cs 'Session' > /dev/null
if [ $? -ne "0" ]; then
echo "Show Session: Failed"
failure=`expr $failure + 1`
@ -456,7 +456,7 @@ fi
rm -f script1.$$
maxadmin -pskysql list dcbs | \
maxadmin -pmariadb list dcbs | \
awk -F\| ' /^ 0x/ { if (NF > 1) { sub(/ +$/, "", $1); sub(/ 0x/, "0x", $1); printf("show dcb \"%s\"\n", $1); } }' > script1.$$
grep -cs "show dcb" script1.$$ >/dev/null
if [ $? -ne "0" ]; then
@ -466,7 +466,7 @@ else
passed=`expr $passed + 1`
echo "list dcbs: Passed"
fi
maxadmin -pskysql script1.$$ | grep -cs 'DCB' > /dev/null
maxadmin -pmariadb script1.$$ | grep -cs 'DCB' > /dev/null
if [ $? -ne "0" ]; then
echo "Show DCB: Failed"
failure=`expr $failure + 1`
@ -477,7 +477,7 @@ fi
rm -f script1.$$
maxadmin -pskysql list services | \
maxadmin -pmariadb list services | \
awk -F\| '{ if (NF > 1) { sub(/ +$/, "", $1); printf("show dbusers \"%s\"\n", $1); } }' > script1.$$
grep -cs "show dbusers" script1.$$ >/dev/null
if [ $? -ne "0" ]; then
@ -487,7 +487,7 @@ else
passed=`expr $passed + 1`
echo "list services: Passed"
fi
maxadmin -pskysql script1.$$ | grep -cs 'Users table data' > /dev/null
maxadmin -pmariadb script1.$$ | grep -cs 'Users table data' > /dev/null
if [ $? -ne "0" ]; then
echo "Show dbusers: Failed"
failure=`expr $failure + 1`