aherman
/
proxysql
mirror of https://github.com/sysown/proxysql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4045 from sysown/v2.x-4000

Browse Source 
Add new variable 'mysql-parse_failure_logs_digest'
pull/4048/head
René Cannaò 3 years ago committed by GitHub
parent ec93211d02 64670f46cc
commit 6bbed9683e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File

1
include/MySQL_Thread.h
Unescape View File

@ -501,6 +501,7 @@ class MySQL_Threads_Handler
bool query_digests_keep_comment;
int query_digests_grouping_limit;
int query_digests_groups_grouping_limit;
bool parse_failure_logs_digest;
bool default_reconnect;
bool have_compress;
bool have_ssl;

2
include/proxysql_structs.h
Unescape View File

@ -824,6 +824,7 @@ __thread bool mysql_thread___query_digests_track_hostname;
__thread bool mysql_thread___query_digests_keep_comment;
__thread int mysql_thread___query_digests_max_digest_length;
__thread int mysql_thread___query_digests_max_query_length;
__thread bool mysql_thread___parse_failure_logs_digest;
__thread int mysql_thread___show_processlist_extended;
__thread int mysql_thread___session_idle_ms;
__thread int mysql_thread___hostgroup_manager_verbose;
@ -988,6 +989,7 @@ extern __thread bool mysql_thread___query_digests_track_hostname;
extern __thread bool mysql_thread___query_digests_keep_comment;
extern __thread int mysql_thread___query_digests_max_digest_length;
extern __thread int mysql_thread___query_digests_max_query_length;
extern __thread bool mysql_thread___parse_failure_logs_digest;
extern __thread int mysql_thread___show_processlist_extended;
extern __thread int mysql_thread___session_idle_ms;
extern __thread int mysql_thread___hostgroup_manager_verbose;

44
lib/MySQL_Session.cpp
Unescape View File

@ -5833,7 +5833,11 @@ bool MySQL_Session::handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___MYSQL_C
}
#endif
if (index(dig,';') && (index(dig,';') != dig + strlen(dig)-1)) {
string nqn = string((char *)CurrentQuery.QueryPointer,CurrentQuery.QueryLength);
string nqn;
if (mysql_thread___parse_failure_logs_digest)
nqn = string((char *)CurrentQuery.QueryPointer,CurrentQuery.QueryLength);
else
nqn = string(CurrentQuery.get_digest_text());
proxy_warning(
"Unable to parse multi-statements command with SET statement from client"
" %s:%d: setting lock hostgroup. Command: %s\n", client_myds->addr.addr,
@ -5876,12 +5880,19 @@ bool MySQL_Session::handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___MYSQL_C
proxy_debug(PROXY_DEBUG_MYSQL_COM, 5, "Processing SET variable %s\n", var.c_str());
if (it->second.size() < 1 || it->second.size() > 2) {
// error not enough arguments
string nqn = string((char *)CurrentQuery.QueryPointer,CurrentQuery.QueryLength);
string query_str = string((char *)CurrentQuery.QueryPointer,CurrentQuery.QueryLength);
string digest_str = string(CurrentQuery.get_digest_text());
string nqn;
if (mysql_thread___parse_failure_logs_digest)
nqn = digest_str;
else
nqn = query_str;
// PMC-10002: A query has failed to be parsed. This can be due a incorrect query or
// due to ProxySQL not being able to properly parse it. In case the query is correct a
// bug report should be filed including the offending query.
proxy_error2(10002, "Unable to parse query. If correct, report it as a bug: %s\n", nqn.c_str());
proxy_debug(PROXY_DEBUG_MYSQL_QUERY_PROCESSOR, 5, "Locking hostgroup for query %s\n", nqn.c_str());
proxy_debug(PROXY_DEBUG_MYSQL_QUERY_PROCESSOR, 5, "Locking hostgroup for query %s\n",
query_str.c_str());
unable_to_parse_set_statement(lock_hostgroup);
return false;
}
@ -5905,9 +5916,17 @@ bool MySQL_Session::handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___MYSQL_C
||
( strcasecmp(value1.c_str(),(char *)"IFNULL") == 0 )
) {
string nqn = string((char *)CurrentQuery.QueryPointer,CurrentQuery.QueryLength);
string query_str = string((char *)CurrentQuery.QueryPointer,
CurrentQuery.QueryLength);
string digest_str = string(CurrentQuery.get_digest_text());
string nqn;
if (mysql_thread___parse_failure_logs_digest)
nqn = digest_str;
else
nqn = query_str;
proxy_error2(10002, "Unable to parse query. If correct, report it as a bug: %s\n", nqn.c_str());
proxy_debug(PROXY_DEBUG_MYSQL_QUERY_PROCESSOR, 5, "Locking hostgroup for query %s\n", nqn.c_str());
proxy_debug(PROXY_DEBUG_MYSQL_QUERY_PROCESSOR, 5,
"Locking hostgroup for query %s\n", query_str.c_str());
unable_to_parse_set_statement(lock_hostgroup);
return false;
}
@ -6346,7 +6365,11 @@ bool MySQL_Session::handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___MYSQL_C
if (kq != 0) {
kq = strncmp((const char *)CurrentQuery.QueryPointer, (const char *)"/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */" , CurrentQuery.QueryLength);
if (kq != 0) {
string nqn = string((char *)CurrentQuery.QueryPointer,CurrentQuery.QueryLength);
string nqn;
if (mysql_thread___parse_failure_logs_digest)
nqn = string((char *)CurrentQuery.QueryPointer,CurrentQuery.QueryLength);
else
nqn = string(CurrentQuery.get_digest_text());
proxy_error2(10002, "Unable to parse query. If correct, report it as a bug: %s\n", nqn.c_str());
return false;
}
@ -7669,8 +7692,10 @@ bool MySQL_Session::known_query_for_locked_on_hostgroup(uint64_t digest) {
void MySQL_Session::unable_to_parse_set_statement(bool *lock_hostgroup) {
// we couldn't parse the query
string nqn = string((char *)CurrentQuery.QueryPointer,CurrentQuery.QueryLength);
proxy_debug(PROXY_DEBUG_MYSQL_QUERY_PROCESSOR, 5, "Locking hostgroup for query %s\n", nqn.c_str());
string query_str = string((char *)CurrentQuery.QueryPointer,CurrentQuery.QueryLength);
string digest_str = string(CurrentQuery.get_digest_text());
string& nqn = ( mysql_thread___parse_failure_logs_digest == true ? digest_str : query_str );
proxy_debug(PROXY_DEBUG_MYSQL_QUERY_PROCESSOR, 5, "Locking hostgroup for query %s\n", query_str.c_str());
if (qpo->multiplex == -1) {
// we have no rule about this SET statement. We set hostgroup locking
if (locked_on_hostgroup < 0) {
@ -7698,7 +7723,8 @@ void MySQL_Session::unable_to_parse_set_statement(bool *lock_hostgroup) {
}
}
} else {
proxy_debug(PROXY_DEBUG_MYSQL_QUERY_PROCESSOR, 5, "Unable to parse SET query but NOT setting lock_hostgroup %s\n", nqn.c_str());
proxy_debug(PROXY_DEBUG_MYSQL_QUERY_PROCESSOR, 5,
"Unable to parse SET query but NOT setting lock_hostgroup %s\n", query_str.c_str());
}
}

4
lib/MySQL_Thread.cpp
Unescape View File

@ -550,6 +550,7 @@ static char * mysql_thread_variables_names[]= {
(char *)"query_digests_normalize_digest_text",
(char *)"query_digests_track_hostname",
(char *)"query_digests_keep_comment",
(char *)"parse_failure_logs_digest",
(char *)"servers_stats",
(char *)"default_reconnect",
#ifdef DEBUG
@ -1177,6 +1178,7 @@ MySQL_Threads_Handler::MySQL_Threads_Handler() {
variables.query_digests_normalize_digest_text=false;
variables.query_digests_track_hostname=false;
variables.query_digests_keep_comment=false;
variables.parse_failure_logs_digest=false;
variables.connpoll_reset_queue_length = 50;
variables.min_num_servers_lantency_awareness = 1000;
variables.aurora_max_lag_ms_only_read_from_replicas = 2;
@ -2123,6 +2125,7 @@ char ** MySQL_Threads_Handler::get_variables_list() {
VariablesPointers_bool["query_digests_normalize_digest_text"] = make_tuple(&variables.query_digests_normalize_digest_text, false);
VariablesPointers_bool["query_digests_track_hostname"] = make_tuple(&variables.query_digests_track_hostname, false);
VariablesPointers_bool["query_digests_keep_comment"] = make_tuple(&variables.query_digests_keep_comment, false);
VariablesPointers_bool["parse_failure_logs_digest"] = make_tuple(&variables.parse_failure_logs_digest, false);
VariablesPointers_bool["servers_stats"] = make_tuple(&variables.servers_stats, false);
VariablesPointers_bool["sessions_sort"] = make_tuple(&variables.sessions_sort, false);
VariablesPointers_bool["stats_time_backend_query"] = make_tuple(&variables.stats_time_backend_query, false);
@ -4071,6 +4074,7 @@ void MySQL_Thread::refresh_variables() {
mysql_thread___query_digests_grouping_limit=(int)GloMTH->get_variable_int((char *)"query_digests_grouping_limit");
mysql_thread___query_digests_groups_grouping_limit=(int)GloMTH->get_variable_int((char *)"query_digests_groups_grouping_limit");
mysql_thread___query_digests_keep_comment=(bool)GloMTH->get_variable_int((char *)"query_digests_keep_comment");
mysql_thread___parse_failure_logs_digest=(bool)GloMTH->get_variable_int((char *)"parse_failure_logs_digest");
variables.min_num_servers_lantency_awareness=GloMTH->get_variable_int((char *)"min_num_servers_lantency_awareness");
variables.aurora_max_lag_ms_only_read_from_replicas=GloMTH->get_variable_int((char *)"aurora_max_lag_ms_only_read_from_replicas");
variables.stats_time_backend_query=(bool)GloMTH->get_variable_int((char *)"stats_time_backend_query");

Write Preview
Loading…
Cancel
Save