Merge pull request #3311 from sysown/v2.1.1-3310

Closes #3310: Improve error reporting for 'MySQL_Monitor' and 'MySQL_Session' backend connections via counters
sysown · Mar 2, 2021 · 1dd24cc · 1dd24cc
2 parents 6d49f5f + 1deee92
commit 1dd24cc
Show file tree

Hide file tree

Showing 7 changed files with 189 additions and 51 deletions.
diff --git a/include/MySQL_Monitor.hpp b/include/MySQL_Monitor.hpp
@@ -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

diff --git a/include/proxysql_structs.h b/include/proxysql_structs.h
@@ -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 */
 
 

diff --git a/lib/MySQL_Monitor.cpp b/lib/MySQL_Monitor.cpp
diff --git a/lib/MySQL_Session.cpp b/lib/MySQL_Session.cpp
diff --git a/lib/MySQL_Thread.cpp b/lib/MySQL_Thread.cpp
@@ -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 {
@@ -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

diff --git a/lib/ProxySQL_Admin.cpp b/lib/ProxySQL_Admin.cpp
@@ -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);

diff --git a/test/tap/tests/test_session_status_flags-t.cpp b/test/tap/tests/test_session_status_flags-t.cpp
@@ -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);