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

Improve bug448 stability

Browse Source 
By removing replication from the equation, the client IP check is more
stable. The get_client_ip function is only used by bug448 and could be
moved there.
This commit is contained in:
Markus Mäkelä
2020-01-16 10:23:46 +02:00
parent 3dda14a58e
commit 7b71716da7
1 changed files with 5 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
maxscale-system-test/testconnections.cpp
View File

@ -1798,64 +1798,16 @@ int TestConnections::create_connections(int m,
int TestConnections::get_client_ip(int m, char* ip) int TestConnections::get_client_ip(int m, char* ip)
{ {
MYSQL* conn;
MYSQL_RES* res;
MYSQL_ROW row;
int ret = 1; int ret = 1;
unsigned long long int rows; auto c = maxscales->rwsplit(m);
unsigned long long int i;
maxscales->connect_rwsplit(m); if (c.connect())
if (execute_query(maxscales->conn_rwsplit[m],
"CREATE DATABASE IF NOT EXISTS db_to_check_client_ip") != 0)
{ {
return ret; std::string host = c.field("SELECT host FROM information_schema.processlist WHERE id = connection_id()");
} strcpy(ip, host.c_str());
maxscales->close_rwsplit(m); ret = 0;
conn = open_conn_db(maxscales->rwsplit_port[m],
maxscales->IP[m],
(char*) "db_to_check_client_ip",
maxscales->user_name,
maxscales->password,
ssl);
if (conn != NULL)
{
if (mysql_query(conn, "show processlist;") != 0)
{
printf("Error: can't execute SQL-query: show processlist\n");
printf("%s\n\n", mysql_error(conn));
}
else
{
res = mysql_store_result(conn);
if (res == NULL)
{
printf("Error: can't get the result description\n");
}
else
{
mysql_num_fields(res);
rows = mysql_num_rows(res);
for (i = 0; i < rows; i++)
{
row = mysql_fetch_row(res);
if ((row[2] != NULL ) && (row[3] != NULL))
{
if (strstr(row[3], "db_to_check_client_ip") != NULL)
{
ret = 0;
strcpy(ip, row[2]);
}
}
}
}
mysql_free_result(res);
}
execute_query(maxscales->conn_rwsplit[m], "DROP DATABASE db_to_check_client_ip");
} }
mysql_close(conn);
return ret; return ret;
} }