Bug #468, http://bugs.skysql.com/show_bug.cgi?id=468, Query classifier accessed freed thread context. If parsing fails thd doesn't need to be freed because it holds correct information about command type.
session.c:session_setup_filters : fixed memory leak
hintparser.c: added token_free for HINT_TOKENs and fixed a few memory leaks.
mysql_client_server_protocol.h: added mysql_protocol_done which frees memory blocks pointed to by protocol members. Those can't be freed in dcb.c because dcb.c doesn't know about protocol's members.
mysql_backend.c:gw_backend_close: fixed memory leak
mysql_client.c: gw_client_close: fixed memory leak
mysql_common.c: added implementation of mysql_protocol_done
:protocol_archive_srv_command: tried to fix memory leak. Some memory is still leaking according to valgrind. Removed use of uninitialized local variable len.
readwritesplit.c: Fix to bug #469, http://bugs.skysql.com/show_bug.cgi?id=469, rwsplit counts every connection twice in master - counnection counts leak
execute_sescmd_in_backend: fixed a memory leak - visible only in DEBUG=Y build.
readwritesplit/test/makefile: added target for hints tests
This commit is contained in:
VilhoRaatikka
@ -1272,6 +1272,8 @@ static int routeQuery(
|
||||
break;
|
||||
|
||||
case MYSQL_COM_STMT_EXECUTE:
|
||||
/** Parsing is not needed for this type of packet */
|
||||
#if defined(NOT_USED)
|
||||
plainsqlbuf = gwbuf_clone_transform(querybuf,
|
||||
GWBUF_TYPE_PLAINSQL);
|
||||
len = GWBUF_LENGTH(plainsqlbuf);
|
||||
@ -1280,7 +1282,8 @@ static int routeQuery(
|
||||
memcpy(querystr, startpos, len);
|
||||
memset(&querystr[len], 0, 1);
|
||||
qtype = skygw_query_classifier_get_type(querystr, 0, &mysql);
|
||||
qtype |= QUERY_TYPE_EXEC_STMT;
|
||||
#endif
|
||||
qtype = QUERY_TYPE_EXEC_STMT;
|
||||
break;
|
||||
|
||||
case MYSQL_COM_SHUTDOWN: /**< 8 where should shutdown be routed ? */
|
||||
@ -2146,7 +2149,7 @@ static bool select_connect_backend_servers(
|
||||
backend_ref[i].bref_state = 0;
|
||||
bref_set_state(&backend_ref[i],
|
||||
BREF_IN_USE);
|
||||
/**
|
||||
/**
|
||||
* Increase backend connection counter.
|
||||
* Server's stats are _increased_ in
|
||||
* dcb.c:dcb_alloc !
|
||||
@ -2184,7 +2187,7 @@ static bool select_connect_backend_servers(
|
||||
session,
|
||||
b->backend_server->protocol);
|
||||
|
||||
if (backend_ref[i].bref_dcb != NULL)
|
||||
if (backend_ref[i].bref_dcb != NULL)
|
||||
{
|
||||
master_connected = true;
|
||||
/**
|
||||
@ -2201,8 +2204,6 @@ static bool select_connect_backend_servers(
|
||||
bref_set_state(&backend_ref[i],
|
||||
BREF_IN_USE);
|
||||
/** Increase backend connection counters */
|
||||
atomic_add(&b->backend_server->stats.n_current, 1);
|
||||
atomic_add(&b->backend_server->stats.n_connections, 1);
|
||||
atomic_add(&b->backend_conn_count, 1);
|
||||
}
|
||||
else
|
||||
@ -2832,6 +2833,7 @@ static bool execute_sescmd_in_backend(
|
||||
pthread_self(),
|
||||
dcb->fd,
|
||||
STRPACKETTYPE(cmd))));
|
||||
gwbuf_free(tmpbuf);
|
||||
}
|
||||
#endif /*< SS_DEBUG */
|
||||
switch (scur->scmd_cur_cmd->my_sescmd_packet_type) {
|
||||
|
||||
@ -14,6 +14,7 @@ RET := -1
|
||||
cleantests:
|
||||
- $(DEL) *.o
|
||||
- $(DEL) *~
|
||||
-$(MAKE) -C test_hints cleantests
|
||||
|
||||
|
||||
testall:
|
||||
@ -32,4 +33,5 @@ runtests:
|
||||
@echo "-------------------------------" >> $(TESTLOG)
|
||||
./rwsplit.sh $(TESTLOG) $(THOST) $(TPORT_RW) $(TMASTER_ID) $(TUSER) $(TPWD)
|
||||
@echo "" >> $(TESTLOG)
|
||||
@cat $(TESTLOG) >> $(TEST_MAXSCALE_LOG)
|
||||
@cat $(TESTLOG) >> $(TEST_MAXSCALE_LOG)
|
||||
-$(MAKE) -C test_hints runtests
|
||||
|
||||
@ -0,0 +1,37 @@
|
||||
# cleantests - clean local and subdirectories' tests
|
||||
# buildtests - build all local and subdirectories' tests
|
||||
# runtests - run all local tests
|
||||
# testall - clean, build and run local and subdirectories' tests
|
||||
|
||||
include ../../../../../../build_gateway.inc
|
||||
include $(ROOT_PATH)/makefile.inc
|
||||
include $(ROOT_PATH)/test.inc
|
||||
|
||||
ARGS=6
|
||||
|
||||
CC=cc
|
||||
TESTLOG := $(shell pwd)/testrwsplit_hints.log
|
||||
RET := -1
|
||||
|
||||
cleantests:
|
||||
- $(DEL) *.o
|
||||
- $(DEL) *~
|
||||
|
||||
|
||||
testall:
|
||||
-$(MAKE) cleantests
|
||||
-$(MAKE) DEBUG=Y buildtests
|
||||
-$(MAKE) runtests
|
||||
|
||||
buildtests:
|
||||
|
||||
|
||||
runtests:
|
||||
@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 "" >> $(TESTLOG)
|
||||
@cat $(TESTLOG) >> $(TEST_MAXSCALE_LOG)
|
||||
@ -0,0 +1,9 @@
|
||||
-- maxscale route to master:3000
|
||||
-- maxscale route to server server1:3000
|
||||
-- maxscale route to server server2:3001
|
||||
-- maxscale route to server server3:3002
|
||||
-- maxscale route to server server4:3003
|
||||
-- maxscale max_slave_replication_lag = 100:
|
||||
-- maxscale max_slave_replication_lag= 100:
|
||||
-- maxscale max_slave_replication_lag =100:
|
||||
-- maxscale max_slave_replication_lag=100:
|
||||
36
server/modules/routing/readwritesplit/test/test_hints/rwsplit_hints.sh
Executable file
36
server/modules/routing/readwritesplit/test/test_hints/rwsplit_hints.sh
Executable file
@ -0,0 +1,36 @@
|
||||
#!/bin/bash
|
||||
NARGS=6
|
||||
TLOG=$1
|
||||
THOST=$2
|
||||
TPORT=$3
|
||||
TMASTER_ID=$4
|
||||
TUSER=$5
|
||||
TPWD=$6
|
||||
|
||||
if [ $# != $NARGS ] ;
|
||||
then
|
||||
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 ""
|
||||
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\
|
||||
|
||||
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 ;
|
||||
fi
|
||||
|
||||
done < $TESTINPUT
|
||||
@ -0,0 +1,15 @@
|
||||
|
||||
-------------------------------
|
||||
Tue Aug 5 13:31:41 EEST 2014
|
||||
Test Read/Write split router - hint routing
|
||||
-------------------------------
|
||||
-- maxscale route to master FAILED, return value 3003 when 3000 was expected
|
||||
-- maxscale route to server server1 FAILED, return value 3003 when 3000 was expected
|
||||
-- maxscale route to server server2 FAILED, return value 3003 when 3001 was expected
|
||||
-- maxscale route to server server3 FAILED, return value 3003 when 3002 was expected
|
||||
-- maxscale route to server server4 PASSED
|
||||
-- maxscale max_slave_replication_lag = 100 FAILED, return value 3003 when was expected
|
||||
-- maxscale max_slave_replication_lag= 100 FAILED, return value 3003 when was expected
|
||||
-- maxscale max_slave_replication_lag =100 FAILED, return value 3003 when was expected
|
||||
-- maxscale max_slave_replication_lag=100 FAILED, return value 3003 when was expected
|
||||
|
||||
Reference in New Issue
Block a user