Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Closes #3310: Improve error reporting for 'MySQL_Monitor' and 'MySQL_Session' backend connections via counters #3311

Merged
merged 7 commits into from
Mar 2, 2021
Merged

Closes #3310: Improve error reporting for 'MySQL_Monitor' and 'MySQL_Session' backend connections via counters #3311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
851339b
Closes #3310: Improve error reporting for 'MySQL_Monitor' and 'MySQL_…
JavierJF Feb 17, 2021
9bffef4
Added missed default initialization of flag 'registered_prometheus_co…
JavierJF Feb 17, 2021
9713abd
Improved naming on new 'PROXYSQL_ERR' enums and explicit values
JavierJF Feb 17, 2021
84e205d
Removed 'PROXYSQL_MONITOR_ERR' enum in favor of single enum 'PROXYSQL…
JavierJF Feb 18, 2021
7c1c829
Compressed multiple 'p_update_mysql_error_counter' with ternary opera…
JavierJF Feb 18, 2021
6587049
Removed hardcoded values for error codes in counters in 'monitor_conn…
JavierJF Feb 18, 2021
1deee92
Added extra wait after setting 'max_replication_lag' in test 'test_se…
JavierJF Feb 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/MySQL_Monitor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ struct cmp_str {
#define AWS_Aurora_Nentries 50

#define N_L_ASE 16

/*

Implementation of monitoring in AWS Aurora will be different than previous modules
Expand Down
26 changes: 26 additions & 0 deletions include/proxysql_structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,32 @@ enum handle_unknown_charset {
HANDLE_UNKNOWN_CHARSET__MAX_HANDLE_VALUE
};

/**
* Enum holding the different MySQL connection errors that are used to report
* invalid states in the backend connections.
*/
enum PROXYSQL_MYSQL_ERR {
ER_PROXYSQL_MAX_CONN_TIMEOUT = 9001,
ER_PROXYSQL_MAX_CONN_FAILURES = 9002,
ER_PROXYSQL_COMMAND_NOT_SUPPORTED = 9003,
ER_PROXYSQL_OFFLINE_SRV = 9004,
ER_PROXYSQL_LAGGING_SRV = 9005,
ER_PROXYSQL_PING_TIMEOUT = 9006,
ER_PROXYSQL_CHANGE_USER_TIMEOUT = 9007,
ER_PROXYSQL_GR_HEALTH_CHECK_TIMEOUT = 9008,
ER_PROXYSQL_GR_HEALTH_CHECKS_MISSED = 9009,
ER_PROXYSQL_READ_ONLY_CHECK_CONN_TIMEOUT = 9010,
ER_PROXYSQL_READ_ONLY_CHECK_TIMEOUT = 9011,
ER_PROXYSQL_READ_ONLY_CHECKS_MISSED = 9012,
ER_PROXYSQL_GALERA_HEALTH_CHECK_CONN_TIMEOUT = 9013,
ER_PROXYSQL_GALERA_HEALTH_CHECK_TIMEOUT = 9014,
ER_PROXYSQL_GALERA_HEALTH_CHECKS_MISSED = 9015,
ER_PROXYSQL_AWS_NO_PINGABLE_SRV = 9016,
ER_PROXYSQL_AWS_HEALTH_CHECK_CONN_TIMEOUT = 9017,
ER_PROXYSQL_AWS_HEALTH_CHECK_TIMEOUT = 9018,
ER_PROXYSQL_SRV_NULL_REPLICATION_LAG = 9019,
};

#endif /* PROXYSQL_ENUMS */


Expand Down
40 changes: 40 additions & 0 deletions lib/MySQL_Monitor.cpp
View file
Open in desktop

Large diffs are not rendered by default.

165 changes: 114 additions & 51 deletions lib/MySQL_Session.cpp
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions lib/MySQL_Thread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4837,6 +4837,7 @@ void MySQL_Thread::process_all_sessions() {
if (sess->session_fast_forward) {
if (sess->HasOfflineBackends()) {
sess->killed=true;
proxy_warning("Killing client connection %s:%d due to 'session_fast_forward' and offline backends\n", sess->client_myds->addr.addr, sess->client_myds->addr.port);
}
}
else {
Expand All @@ -4855,6 +4856,7 @@ void MySQL_Thread::process_all_sessions() {
if ( (sess_time/1000 > (unsigned long long)mysql_thread___wait_timeout) ) {
sess->killed=true;
sess->to_process=1;
proxy_warning("Killing client connection %s:%d because inactive for %llums\n", sess->client_myds->addr.addr, sess->client_myds->addr.port, sess_time/1000);
}
}
#endif // IDLE_THREADS
Expand Down
3 changes: 3 additions & 0 deletions lib/ProxySQL_Admin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5195,6 +5195,9 @@ ProxySQL_Admin::ProxySQL_Admin() :
rand_del[4] = '-';
rand_del[5] = 0;

// Default initialize prometheus collectable flag
registered_prometheus_collectable = false;

// Initialize prometheus metrics
init_prometheus_counter_array<admin_metrics_map_idx, p_admin_counter>(admin_metrics_map, this->metrics.p_counter_array);
init_prometheus_gauge_array<admin_metrics_map_idx, p_admin_gauge>(admin_metrics_map, this->metrics.p_gauge_array);
Expand Down
3 changes: 3 additions & 0 deletions test/tap/tests/test_session_status_flags-t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ int main(int argc, char *argv[]) {
MYSQL_QUERY(proxysql_admin, "UPDATE mysql_servers SET max_replication_lag=20");
MYSQL_QUERY(proxysql_admin, "LOAD MYSQL SERVERS TO RUNTIME");

// Wait for ProxySQL to detect replication issues
sleep(10);

{
MYSQL* proxysql_mysql = mysql_init(NULL);

Expand Down