Merge pull request #15 from skysql/hint_tests

tests for hints and changes in makefiles and configuration files to enab...
2014-08-08 13:52:33 +03:00 · 2014-08-08 13:52:33 +03:00 · 4228ecac53
commit 4228ecac53
parent d4de582e16 f23a9e2b72
11 changed files with 300 additions and 22 deletions
--- a/Documentation/internal/hint_syntax.pdf
+++ b/Documentation/internal/hint_syntax.pdf
--- a/server/modules/routing/readwritesplit/test/makefile
+++ b/server/modules/routing/readwritesplit/test/makefile
@ -14,13 +14,13 @@ RET := -1
 cleantests:
 	- $(DEL) *.o 
 	- $(DEL) *~
-	-$(MAKE) -C test_hints cleantests


 testall: 
 	-$(MAKE) cleantests
 	-$(MAKE) DEBUG=Y buildtests
 	-$(MAKE) runtests
+	-$(MAKE) -C test_hints testall

 buildtests:

@ -34,4 +34,3 @@ runtests:
 	./rwsplit.sh $(TESTLOG) $(THOST) $(TPORT_RW) $(TMASTER_ID) $(TUSER) $(TPWD) 
 	@echo ""                        >> $(TESTLOG)
 	@cat $(TESTLOG)			>> $(TEST_MAXSCALE_LOG)
-	-$(MAKE) -C test_hints runtests
--- a/server/modules/routing/readwritesplit/test/test_hints/Makefile
+++ b/server/modules/routing/readwritesplit/test/test_hints/Makefile
@ -16,7 +16,9 @@ RET := -1
 cleantests:
 	- $(DEL) *.o 
 	- $(DEL) *~
-
+	- $(DEL) *.sql
+	- $(DEL) *.output
+	- $(DEL) *.log

 testall: 
 	-$(MAKE) cleantests
@ -27,11 +29,25 @@ buildtests:


 runtests:
-	@echo ""				>  $(TESTLOG)
+	@echo ""				>>  $(TESTLOG)
 	@echo "-------------------------------"	>> $(TESTLOG)
 	@echo $(shell date)			>> $(TESTLOG)
 	@echo "Test Read/Write split router - hint routing"	>> $(TESTLOG)
 	@echo "-------------------------------"	>> $(TESTLOG)
-	./rwsplit_hints.sh $(TESTLOG) $(THOST) $(TPORT_RW) $(TMASTER_ID) $(TUSER) $(TPWD)
+	@echo "Running simple tests"	>> $(TESTLOG)
+	@echo ""                        >> $(TESTLOG)	
+	./rwsplit_hints.sh $(TESTLOG) $(THOST) $(TPORT_RW_HINT) $(TMASTER_ID) $(TUSER) $(TPWD) simple_tests
+	@echo ""                        >> $(TESTLOG)
+	@echo "Running syntax error tests"	>> $(TESTLOG)
+	@echo ""                        >> $(TESTLOG)	
+	./syntax_check.sh $(TESTLOG) $(THOST) $(TPORT_RW_HINT) $(TMASTER_ID) $(TUSER) $(TPWD) error_tests
+	@echo ""                        >> $(TESTLOG)
+	@echo "Running complex tests"	>> $(TESTLOG)
+	@echo ""                        >> $(TESTLOG)	
+	./rwsplit_hints.sh $(TESTLOG) $(THOST) $(TPORT_RW_HINT) $(TMASTER_ID) $(TUSER) $(TPWD) complex_tests
+	@echo ""                        >> $(TESTLOG)
+	@echo "Running stack tests"	>> $(TESTLOG)	
+	@echo ""                        >> $(TESTLOG)	
+	./rwsplit_hints.sh $(TESTLOG) $(THOST) $(TPORT_RW_HINT) $(TMASTER_ID) $(TUSER) $(TPWD) stack_tests
 	@echo ""                        >> $(TESTLOG)
 	@cat $(TESTLOG)			>> $(TEST_MAXSCALE_LOG)
--- a/server/modules/routing/readwritesplit/test/test_hints/complex_tests
+++ b/server/modules/routing/readwritesplit/test/test_hints/complex_tests
@ -0,0 +1,48 @@
+select @@server_id; -- maxscale begin route to master:3000
+select @@server_id;:3000
+select @@server_id; -- maxscale route to server server3:3002
+select @@server_id;:3000
+select @@server_id; -- maxscale end:
+select @@server_id; -- maxscale named1 prepare route to master:
+select @@server_id; -- maxscale named1 begin:3000
+select @@server_id;:3000
+select @@server_id; -- maxscale route to server server3:3002
+select @@server_id;:3000
+select @@server_id; -- maxscale end:
+select @@server_id; -- maxscale shorthand1 begin route to server server2:3001
+select @@server_id;:3001
+select @@server_id; -- maxscale route to server server3:3002
+select @@server_id;:3001
+select @@server_id; -- maxscale end:
+select @@server_id; # maxscale begin route to master:3000
+select @@server_id;:3000
+select @@server_id; # maxscale route to server server3:3002
+select @@server_id;:3000
+select @@server_id; # maxscale end:
+select @@server_id; # maxscale named2 prepare route to master:
+select @@server_id; # maxscale named2 begin:3000
+select @@server_id;:3000
+select @@server_id; # maxscale route to server server3:3002
+select @@server_id;:3000
+select @@server_id; # maxscale end:
+select @@server_id; # maxscale shorthand2 begin route to server server2:3001
+select @@server_id;:3001
+select @@server_id; # maxscale route to server server3:3002
+select @@server_id;:3001
+select @@server_id; # maxscale end:
+select @@server_id/* maxscale begin route to master */;:3000
+select @@server_id;:3000
+select @@server_id/* maxscale route to server server3 */;:3002
+select @@server_id;:3000
+select @@server_id/* maxscale end */;:
+select @@server_id/* maxscale named3 prepare route to master */;:
+select @@server_id/* maxscale named3 begin */;:3000
+select @@server_id;:3000
+select @@server_id/* maxscale route to server server3 */;:3002
+select @@server_id;:3000
+select @@server_id/* maxscale end */;:
+select @@server_id/* maxscale shorthand3 begin route to server server2 */; :3001
+select @@server_id;:3001
+select @@server_id/* maxscale route to server server3 */;:3002
+select @@server_id;:3001
+select @@server_id/* maxscale end */;:
--- a/server/modules/routing/readwritesplit/test/test_hints/error_tests
+++ b/server/modules/routing/readwritesplit/test/test_hints/error_tests
@ -0,0 +1,39 @@
+select @@server_id; -- maxscalemaxscale route to master:
+select @@server_id; -- master to route maxscale:
+select @@server_id; -- route to master:
+select @@server_id; -- maxscale to master:
+select @@server_id; -- maxscale route master:
+select @@server_id; -- maxscale route to:
+select @@server_id; -- maxscale begin master:
+select @@server_id; -- maxscale master route to master:
+select @@server_id; -- maxscale route to maxscale route to master:
+select @@server_id; -- maxscale maxscale route to master:
+select @@server_id; -- maxscale route to to server =):
+select @@server_id; -- maxscale route to maxscale server server1:
+select @@server_id; -- maxscale route to server1:
+select @@server_id; # maxscalemaxscale route to master:
+select @@server_id; # master to route maxscale:
+select @@server_id; # route to master:
+select @@server_id; # maxscale to master:
+select @@server_id; # maxscale route master:
+select @@server_id; # maxscale route to:
+select @@server_id; # maxscale begin master:
+select @@server_id; # maxscale master route to master:
+select @@server_id; # maxscale route to maxscale route to master:
+select @@server_id; # maxscale maxscale route to master:
+select @@server_id; # maxscale route to to server =):
+select @@server_id; # maxscale route to maxscale server server1:
+select @@server_id; # maxscale route to server1:
+select @@server_id; /* maxscalemaxscale route to master */;:
+select @@server_id; /* master to route maxscale */;:
+select @@server_id; /* route to master */;:
+select @@server_id; /* maxscale to master */;:
+select @@server_id; /* maxscale route master */;:
+select @@server_id; /* maxscale route to */;:
+select @@server_id; /* maxscale begin master */;:
+select @@server_id; /* maxscale master route to master */;:
+select @@server_id; /* maxscale route to maxscale route to master */;:
+select @@server_id; /* maxscale maxscale route to master */;:
+select @@server_id; /* maxscale route to to server =) */;:
+select @@server_id; /* maxscale route to maxscale server server1 */;:
+select @@server_id; /* maxscale route to server1 */;:
--- a/server/modules/routing/readwritesplit/test/test_hints/rwsplit_hints.sh
+++ b/server/modules/routing/readwritesplit/test/test_hints/rwsplit_hints.sh
@ -1,11 +1,12 @@
 #!/bin/bash
-NARGS=6
+NARGS=7
 TLOG=$1
 THOST=$2
 TPORT=$3
 TMASTER_ID=$4
 TUSER=$5
 TPWD=$6
+TESTINPUT=$7

 if [ $# != $NARGS ] ;
 then
@ -13,24 +14,52 @@ echo""
 echo "Wrong number of arguments, gave "$#" but "$NARGS" is required"
 echo "" 
 echo "Usage :" 
-echo "        rwsplit.sh <log filename> <host> <port> <master id> <user> <password>"
+echo "        rwsplit_hints.sh <log filename> <host> <port> <master id> <user> <password> <test file>"
 echo ""
 exit 1
 fi

-TESTINPUT=hints.txt
-QUERY="select @@server_id;"
-RUNCMD=mysql\ --host=$THOST\ -P$TPORT\ -u$TUSER\ -p$TPWD\ --unbuffered=true\ --disable-reconnect\ --silent\
+
+RUNCMD=mysql\ --host=$THOST\ -P$TPORT\ -u$TUSER\ -p$TPWD\ --unbuffered=true\ --disable-reconnect\ --silent\ --comment
+i=0

 while read -r LINE
 do
-TINPUT=`echo "$LINE"|awk '{split($0,a,":");print a[1]}'`
-TRETVAL=`echo "$LINE"|awk '{split($0,a,":");print a[2]}'`
-a=`$RUNCMD -e"$QUERY$TINPUT"`
-if [ "$a" != "$TRETVAL" ]; then 
-        echo "$TINPUT FAILED, return value $a when $TRETVAL was expected">>$TLOG; 
-else 
-        echo "$TINPUT PASSED">>$TLOG ; 
+TINPUT[$i]=`echo "$LINE"|awk '{split($0,a,":");print a[1]}'`
+TRETVAL[$i]=`echo "$LINE"|awk '{split($0,a,":");print a[2]}'`
+echo "${TINPUT[i]}" >> $TESTINPUT.sql
+i=$((i+1))
+done < $TESTINPUT
+
+`$RUNCMD < $TESTINPUT.sql > $TESTINPUT.output`
+
+x=0
+crash=1
+all_passed=1
+
+while read -r TOUTPUT
+do
+crash=0
+if [ "$TOUTPUT" != "${TRETVAL[x]}" -a "${TRETVAL[x]}" != "" ]
+then 
+    all_passed=0
+    echo "$TESTINPUT:$((x + 1)): ${TINPUT[x]} FAILED, return value $TOUTPUT when ${TRETVAL[x]} was expected">>$TLOG; 
+fi
+x=$((x+1))
+done < $TESTINPUT.output
+
+if [ $crash -eq 1 ]
+then
+    all_passed=0
+    for ((v=0;v<$i;v++))
+    do
+	echo "${TINPUT[v]} FAILED, nothing was returned">>$TLOG; 
+    done
 fi

-done < $TESTINPUT
+if [ $all_passed -eq 1 ]
+then
+    echo "Test set: PASSED">>$TLOG; 
+else
+    echo "Test set: FAILED">>$TLOG; 
+fi
--- a/server/modules/routing/readwritesplit/test/test_hints/simple_tests
+++ b/server/modules/routing/readwritesplit/test/test_hints/simple_tests
@ -0,0 +1,18 @@
+select @@server_id; -- maxscale route to master:3000
+select @@server_id; -- maxscale route to slave:
+select @@server_id; -- maxscale route to server server1:3000
+select @@server_id; -- maxscale route to server server2:3001
+select @@server_id; -- maxscale route to server server3:3002
+select @@server_id; -- maxscale route to server server4:3003
+select @@server_id; # maxscale route to master:3000
+select @@server_id; # maxscale route to slave:
+select @@server_id; # maxscale route to server server1:3000
+select @@server_id; # maxscale route to server server2:3001
+select @@server_id; # maxscale route to server server3:3002
+select @@server_id; # maxscale route to server server4:3003
+select @@server_id/* maxscale route to master */;:3000
+select @@server_id/* maxscale route to slave */;:
+select @@server_id/* maxscale route to server server1 */;:3000
+select @@server_id/* maxscale route to server server2 */;:3001
+select @@server_id/* maxscale route to server server3 */;:3002
+select @@server_id/* maxscale route to server server4 */;:3003
--- a/server/modules/routing/readwritesplit/test/test_hints/stack_tests
+++ b/server/modules/routing/readwritesplit/test/test_hints/stack_tests
@ -0,0 +1,50 @@
+select @@server_id; -- maxscale stack_named1 prepare route to server server1:
+select @@server_id; -- maxscale stack_named2 prepare route to server server2:
+select @@server_id; -- maxscale stack_named3 prepare route to server server3:
+select @@server_id; -- maxscale stack_named4 prepare route to server server4:
+select @@server_id; -- maxscale stack_named1 begin:3000
+select @@server_id;:3000
+select @@server_id; -- maxscale stack_named2 begin:3001
+select @@server_id;:3001
+select @@server_id; -- maxscale stack_named3 begin:3002
+select @@server_id;:3002
+select @@server_id; -- maxscale stack_named4 begin:3003
+select @@server_id;:3003
+select @@server_id; -- maxscale stack_shorthand1 begin route to server server1:3000
+select @@server_id;:3000
+select @@server_id; -- maxscale stack_shorthand2 begin route to server server2:3001
+select @@server_id;:3001
+select @@server_id; -- maxscale stack_shorthand3 begin route to server server3:3002
+select @@server_id;:3002
+select @@server_id; -- maxscale stack_shorthand4 begin route to server server4:3003
+select @@server_id;:3003
+select @@server_id; -- maxscale end:3002
+select @@server_id;:3002
+select @@server_id; -- maxscale end:3001
+select @@server_id;:3001
+select @@server_id; -- maxscale end:3000
+select @@server_id;:3000
+select @@server_id; -- maxscale end:3003
+select @@server_id;:3003
+select @@server_id; -- maxscale end:3002
+select @@server_id;:3002
+select @@server_id; -- maxscale end:3001
+select @@server_id;:3001
+select @@server_id; -- maxscale end:3000
+select @@server_id; -- maxscale end:
+select @@server_id; -- maxscale stack_shorthand1 begin:3000
+select @@server_id; -- maxscale stack_shorthand2 begin:3001
+select @@server_id; -- maxscale stack_shorthand3 begin:3002
+select @@server_id; -- maxscale stack_shorthand4 begin:3003
+select @@server_id; -- maxscale stack_named1 begin:3000
+select @@server_id; -- maxscale stack_named2 begin:3001
+select @@server_id; -- maxscale stack_named3 begin:3002
+select @@server_id; -- maxscale stack_named4 begin:3003
+select @@server_id; -- maxscale end:3002
+select @@server_id; -- maxscale end:3001
+select @@server_id; -- maxscale end:3000
+select @@server_id; -- maxscale end:3003
+select @@server_id; -- maxscale end:3002
+select @@server_id; -- maxscale end:3001
+select @@server_id; -- maxscale end:3000
+select @@server_id; -- maxscale end:
--- a/server/modules/routing/readwritesplit/test/test_hints/syntax_check.sh
+++ b/server/modules/routing/readwritesplit/test/test_hints/syntax_check.sh
@ -0,0 +1,33 @@
+#! /bin/bash
+NARGS=7
+TLOG=$1
+THOST=$2
+TPORT=$3
+TMASTER_ID=$4
+TUSER=$5
+TPWD=$6
+TESTINPUT=$7
+
+if [ $# != $NARGS ] ;
+then
+echo""
+echo "Wrong number of arguments, gave "$#" but "$NARGS" is required"
+echo "" 
+echo "Usage :" 
+echo "        syntax_check.sh <log filename> <host> <port> <master id> <user> <password> <test file>"
+ echo ""
+exit 1
+fi
+
+./rwsplit_hints.sh dummy.log $THOST $TPORT $TMASTER_ID $TUSER $TPWD $TESTINPUT
+
+exp_count=`cat error_tests | grep -c '.*'`
+err_count=`tail -n $exp_count ../../../../../test/log/skygw_err*|grep -c 'Hint ignored'`
+
+if [ "$err_count" == "$exp_count" ]
+then
+    echo "Test set: PASSED">>$TLOG; 
+else
+    echo "Expected $exp_count ignored hints in the error log but found $err_count instead">>$TLOG
+    echo "Test set: FAILED">>$TLOG; 
+fi
--- a/server/test/MaxScale_test.cnf
+++ b/server/test/MaxScale_test.cnf
@ -20,11 +20,13 @@ threads=1
 # 	user =<user name - must have slave replication and 
 #                          slave client privileges>
 # 	passwd=<password of the above user, plain text currently>
+#	monitor_interval=<sampling interval in milliseconds,
+#                          default value is 10000>

 [MySQL Monitor]
 type=monitor
 module=mysqlmon
-servers=server1,server2,server3
+servers=server1,server2,server3,server4
 user=maxuser
 passwd=maxpwd

@ -36,25 +38,42 @@ passwd=maxpwd
 # 	servers=<server name>,<server name>,...
 # 	user=<User to fetch password inforamtion with>
 # 	passwd=<Password of the user, plain text currently>
+#	enable_root_user=<0 or 1, default is 0>
+#	version_string=<specific string for server handshake,
+#		default is the MariaDB embedded library version>
 #
 # Valid router modules currently are:
 # 	readwritesplit, readconnroute and debugcli

+
 [RW Split Router]
 type=service
 router=readwritesplit
-servers=server1,server2,server3
+servers=server1,server2,server3,server4
+max_slave_connections=90%
 user=maxuser
 passwd=maxpwd

+
+[RW Split Hint Router]
+type=service
+router=readwritesplit
+servers=server1,server2,server3,server4
+max_slave_connections=90%
+user=maxuser
+passwd=maxpwd
+filters=Hint
+
+
 [Read Connection Router]
 type=service
 router=readconnroute
-router_options=slave
-servers=server1,server2,server3
+router_options=master
+servers=server1
 user=maxuser
 passwd=maxpwd

+
 [HTTPD Router]
 type=service
 router=testroute
@ -64,6 +83,12 @@ servers=server1,server2,server3
 type=service
 router=debugcli

+
+[Hint]
+type=filter
+module=hintfilter
+
+
 # Listener definitions for the services
 #
 # Valid options are:
@ -71,6 +96,8 @@ router=debugcli
 # 	service=<name of service defined elsewhere>
 # 	protocol=<name of protocol module with which to listen>
 # 	port=<Listening port>
+#	address=<Address to bind to>
+#	socket=<Listening socket>

 [RW Split Listener]
 type=listener
@ -78,17 +105,25 @@ service=RW Split Router
 protocol=MySQLClient
 port=4006

+[RW Split Hint Listener]
+type=listener
+service=RW Split Hint Router
+protocol=MySQLClient
+port=4009
+
 [Read Connection Listener]
 type=listener
 service=Read Connection Router
 protocol=MySQLClient
 port=4008
+#socket=/tmp/readconn.sock

 [Debug Listener]
 type=listener
 service=Debug Interface
 protocol=telnetd
 port=4442
+#address=127.0.0.1

 [HTTPD Listener]
 type=listener
@ -115,3 +150,9 @@ type=server
 address=127.0.0.1
 port=3002
 protocol=MySQLBackend
+
+[server4]
+type=server
+address=127.0.0.1
+port=3003
+protocol=MySQLBackend
--- a/test.inc
+++ b/test.inc
@ -19,6 +19,11 @@ TPORT_RCONN     :=
 #
 TPORT_RW        :=
 #
+# port of read/write split router module with hints, for example:
+# TPORT_RW_HINT      := 4009
+#
+TPORT_RW_HINT        :=
+#
 # username of MaxScale user, for example:
 # TUSER         := maxuser
 #