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

Merge branch '2.2' into 2.3

Browse Source
This commit is contained in:
Markus Mäkelä
2019-02-08 16:14:58 +02:00
parent c0593936b8 3c5dd257fd
commit d04fc6c4b9
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maxscale-system-test/cnf/maxscale.cnf.template.mxs827_write_timeout
View File

@ -18,7 +18,7 @@ user=maxskysql
password=skysql password=skysql
slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
max_slave_connections=1 max_slave_connections=1
connection_keepalive=5 connection_keepalive=1
[Read Connection Router Slave] [Read Connection Router Slave]
type=service type=service

8
maxscale-system-test/mxs827_write_timeout.cpp
View File

@ -23,14 +23,16 @@ int main(int argc, char* argv[])
create_t1(Test->maxscales->conn_rwsplit[0]); create_t1(Test->maxscales->conn_rwsplit[0]);
for (int i = 0; i < 30; i++) Test->tprintf("Doing reads for 30 seconds");
time_t start = time(NULL);
while (time(NULL) - start < 30)
{ {
Test->tprintf("Trying query %d\n", i);
Test->set_timeout(10); Test->set_timeout(10);
Test->try_query(Test->maxscales->conn_rwsplit[0], "SELECT 1"); Test->try_query(Test->maxscales->conn_rwsplit[0], "SELECT 1");
sleep(1);
} }
Test->tprintf("Doing one write");
Test->try_query(Test->maxscales->conn_rwsplit[0], "INSERT INTO t1 VALUES (1, 1)"); Test->try_query(Test->maxscales->conn_rwsplit[0], "INSERT INTO t1 VALUES (1, 1)");
Test->check_maxscale_alive(0); Test->check_maxscale_alive(0);

2
server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
View File

@ -920,7 +920,7 @@ static int gw_read_and_write(DCB* dcb)
if (proto->ignore_replies > 0) if (proto->ignore_replies > 0)
{ {
/** The reply to a COM_CHANGE_USER is in packet */ /** The reply to a COM_CHANGE_USER is in packet */
GWBUF* query = proto->stored_query; GWBUF* query = modutil_get_next_MySQL_packet(&proto->stored_query);
proto->stored_query = NULL; proto->stored_query = NULL;
proto->ignore_replies--; proto->ignore_replies--;
mxb_assert(proto->ignore_replies >= 0); mxb_assert(proto->ignore_replies >= 0);