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

Refactoring ProxySQL Monitor Module #4063

Merged
merged 10 commits into from
Jan 27, 2023
Merged

Refactoring ProxySQL Monitor Module #4063

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1a47d98
Refactoring ProxySQL Monitor Module
rahim-kanji Dec 21, 2022
147d23a
Refactoring ProxySQL Monitor Module
rahim-kanji Dec 22, 2022
7fa44ce
Avoid null pointer mysql connection access in Debug
rahim-kanji Dec 22, 2022
ebc7ebf
* Added total poll timeout in case poll is waiting on stale connection.
rahim-kanji Dec 23, 2022
6da9271
Few optimizations and fixes
rahim-kanji Dec 29, 2022
821a6f4
* Moved task_handler code from .hpp to .cpp
rahim-kanji Dec 30, 2022
11be1f1
* Bulk processing of ready tasks based on provided percentage
rahim-kanji Jan 4, 2023
340a4f3
Added proxysqltest: monitor task forced timeout
rahim-kanji Jan 11, 2023
3bb4bcf
* Added few comments and fixed comment style
rahim-kanji Jan 25, 2023
ae40be4
Resolve conflicts
rahim-kanji Jan 25, 2023
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
112 changes: 90 additions & 22 deletions include/MySQL_Monitor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,25 +178,35 @@ class MyGR_monitor_node {
class MySQL_Monitor_Connection_Pool;

enum MySQL_Monitor_State_Data_Task_Type {
MON_CLOSE_CONNECTION,
MON_CONNECT,
MON_PING,
MON_READ_ONLY,
MON_INNODB_READ_ONLY,
MON_READ_ONLY__AND__INNODB_READ_ONLY,
MON_READ_ONLY__OR__INNODB_READ_ONLY,
MON_SUPER_READ_ONLY,
MON_REPLICATION_LAG
MON_GROUP_REPLICATION,
MON_REPLICATION_LAG,
MON_GALERA,
MON_AWS_AURORA
};

enum class MySQL_Monitor_State_Data_Task_Result {
TASK_RESULT_UNKNOWN,
TASK_RESULT_TIMEOUT,
TASK_RESULT_FAILED,
TASK_RESULT_SUCCESS,
TASK_RESULT_PENDING
};


class MySQL_Monitor_State_Data {
public:
MySQL_Monitor_State_Data_Task_Type task_id;
struct timeval tv_out;
unsigned long long t1;
unsigned long long t2;
int ST;
char *hostname;
int port;
public:
unsigned long long t1;
unsigned long long t2;
char *hostname;
int port;
int writer_hostgroup; // used only by group replication
bool writer_is_also_reader; // used only by group replication
int max_transactions_behind; // used only by group replication
Expand All @@ -206,22 +216,73 @@ class MySQL_Monitor_State_Data {
int aws_aurora_add_lag_ms;
int aws_aurora_min_lag_ms;
int aws_aurora_lag_num_checks;
bool use_ssl;
MYSQL *mysql;
MYSQL_RES *result;
MYSQL *ret;
int interr;
char * mysql_error_msg;
MYSQL_ROW *row;
unsigned int repl_lag;
unsigned int hostgroup_id;
MySQL_Monitor_State_Data(char *h, int p, struct event_base *b, bool _use_ssl=0, int g=0);
bool use_ssl;
MYSQL *mysql;
MYSQL_RES *result;
int interr;
char *mysql_error_msg;
unsigned int repl_lag;
unsigned int hostgroup_id;
bool use_percona_heartbeat;
SQLite3DB* mondb;

MySQL_Monitor_State_Data(MySQL_Monitor_State_Data_Task_Type task_type, char* h, int p, bool _use_ssl = 0, int g = 0);
~MySQL_Monitor_State_Data();
SQLite3DB *mondb;
void init_async();
JavierJF marked this conversation as resolved.
Show resolved Hide resolved
void mark_task_as_timeout();
bool create_new_connection();
MDB_ASYNC_ST async_state_machine;

int async_exit_status;
bool set_wait_timeout();


MySQL_Monitor_State_Data_Task_Result task_handler(short event_, short& wait_event) {
assert(task_handler_);
task_result_ = (this->*task_handler_)(event_, wait_event);
return task_result_;
}

inline
MySQL_Monitor_State_Data_Task_Type get_task_type() const {
return task_id_;
}

inline
MySQL_Monitor_State_Data_Task_Result get_task_result() const {
return task_result_;
}

private:
std::string query_;
unsigned long long timeout_;
MySQL_Monitor_State_Data_Task_Type task_id_;
MySQL_Monitor_State_Data_Task_Result task_result_;
MDB_ASYNC_ST async_state_machine_;

short next_event(MDB_ASYNC_ST new_st, int status);
MySQL_Monitor_State_Data_Task_Result (MySQL_Monitor_State_Data::*task_handler_)(short event_, short& wait_event);
MySQL_Monitor_State_Data_Task_Result ping_handler(short event_, short& wait_event);
MySQL_Monitor_State_Data_Task_Result generic_handler(short event_, short& wait_event);

inline
MySQL_Monitor_State_Data_Task_Result read_only_handler(short event_, short& wait_event) {
return generic_handler(event_, wait_event);
}

inline
MySQL_Monitor_State_Data_Task_Result group_replication_handler(short event_, short& wait_event) {
return generic_handler(event_, wait_event);
}

inline
MySQL_Monitor_State_Data_Task_Result replication_lag_handler(short event_, short& wait_event) {
return generic_handler(event_, wait_event);
}

inline
MySQL_Monitor_State_Data_Task_Result galera_handler(short event_, short& wait_event) {
return generic_handler(event_, wait_event);
}
};

template<typename T>
Expand Down Expand Up @@ -388,7 +449,7 @@ class MySQL_Monitor {
void p_update_metrics();
std::unique_ptr<wqueue<WorkItem<MySQL_Monitor_State_Data>*>> queue;
MySQL_Monitor_Connection_Pool *My_Conn_Pool;
bool shutdown;
volatile bool shutdown;
JavierJF marked this conversation as resolved.
Show resolved Hide resolved
pthread_mutex_t mon_en_mutex;
bool monitor_enabled;
SQLite3DB *admindb; // internal database
Expand Down Expand Up @@ -428,6 +489,13 @@ class MySQL_Monitor {
void evaluate_aws_aurora_results(unsigned int wHG, unsigned int rHG, AWS_Aurora_status_entry **lasts_ase, unsigned int ase_idx, unsigned int max_latency_ms, unsigned int add_lag_ms, unsigned int min_lag_ms, unsigned int lag_num_checks);
unsigned int estimate_lag(char* server_id, AWS_Aurora_status_entry** ase, unsigned int idx, unsigned int add_lag_ms, unsigned int min_lag_ms, unsigned int lag_num_checks);
// void gdb_dump___monitor_mysql_server_aws_aurora_log(char *hostname);

private:
void monitor_ping_async(SQLite3DB* monitordb, SQLite3_result* resultset);
JavierJF marked this conversation as resolved.
Show resolved Hide resolved
void monitor_read_only_async(SQLite3DB* monitordb, SQLite3_result* resultset);
void monitor_replication_lag_async(SQLite3DB* monitordb, SQLite3_result* resultset);
void monitor_group_replication_async(SQLite3DB* monitordb);
void monitor_galera_async(SQLite3DB* monitordb);
};

#endif /* __CLASS_MYSQL_MONITOR_H */
15 changes: 13 additions & 2 deletions include/proxysql_structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,20 @@ enum MDB_ASYNC_ST { // MariaDB Async State Machine
ASYNC_QUERY_START,
ASYNC_QUERY_CONT,
ASYNC_QUERY_END,
ASYNC_QUERY_SUCCESSFUL,
ASYNC_QUERY_FAILED,
ASYNC_QUERY_TIMEOUT,
ASYNC_NEXT_RESULT_START,
ASYNC_NEXT_RESULT_CONT,
ASYNC_NEXT_RESULT_END,
#ifndef PROXYSQL_USE_RESULT
//#ifndef PROXYSQL_USE_RESULT
ASYNC_STORE_RESULT_START,
ASYNC_STORE_RESULT_CONT,
#endif // PROXYSQL_USE_RESULT
ASYNC_STORE_RESULT_END,
ASYNC_STORE_RESULT_SUCCESSFUL,
ASYNC_STORE_RESULT_FAILED,
ASYNC_STORE_RESULT_TIMEOUT,
//#endif // PROXYSQL_USE_RESULT
ASYNC_USE_RESULT_START,
ASYNC_USE_RESULT_CONT,
ASYNC_INITDB_START,
Expand All @@ -105,6 +112,10 @@ enum MDB_ASYNC_ST { // MariaDB Async State Machine
ASYNC_STMT_EXECUTE_STORE_RESULT_CONT,
ASYNC_STMT_EXECUTE_END,

ASYNC_CLOSE_START,
ASYNC_CLOSE_CONT,
ASYNC_CLOSE_END,

ASYNC_IDLE
};

Expand Down
Loading