Parsing and setting wait timeout for session

pull/4901/head
Yashwant Sahu 1 year ago
parent e17477e297
commit abe16e6692

@ -82,6 +82,7 @@ class Base_Session {
int pending_connect;
enum proxysql_session_type session_type;
int warning_in_hg;
int wait_timeout; //in milliseconds
// bool
bool autocommit;

@ -681,6 +681,7 @@ MySQL_Session::MySQL_Session() {
last_HG_affected_rows = -1; // #1421 : advanced support for LAST_INSERT_ID()
proxysql_node_address = NULL;
use_ldap_auth = false;
wait_timeout = mysql_thread___wait_timeout;
}
/**
@ -6414,6 +6415,22 @@ bool MySQL_Session::handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___MYSQL_C
proxy_debug(PROXY_DEBUG_MYSQL_COM, 8, "Changing connection charset to %d\n", c->nr);
client_myds->myconn->set_charset(c->nr, NAMES);
}
} else if (var == "wait_timeout") {
std::string value = *values++;
proxy_debug(PROXY_DEBUG_MYSQL_COM, 5, "Client requested SET wait_timeout = %s\n", value.c_str());
int client_timeout = atoi(value.c_str()) * 1000; // converting into milliseconds, mysql set timeout is in second
if (client_timeout <= 0 || client_timeout > mysql_thread___wait_timeout) {
char errmsg[128];
snprintf(errmsg, sizeof(errmsg), "wait_timeout is less/equal than 0 or wait_timeout is %d exceeds maximum allowed %d", client_timeout, mysql_thread___wait_timeout);
client_myds->DSS = STATE_QUERY_SENT_NET;
client_myds->myprot.generate_pkt_ERR(true, NULL, NULL, 1, 1231, (char *)"42000", errmsg, true);
client_myds->DSS = STATE_SLEEP;
status = WAITING_CLIENT_DATA;
return true;
}
wait_timeout = client_timeout;
} else if (var == "tx_isolation") {
std::string value1 = *values;
proxy_debug(PROXY_DEBUG_MYSQL_COM, 5, "Processing SET tx_isolation value %s\n", value1.c_str());

@ -3790,7 +3790,7 @@ void MySQL_Thread::ProcessAllSessions_MaintenanceLoop(MySQL_Session *sess, unsig
* @param curtime The current time, in milliseconds.
* @param sess The MySQL session to handle.
*/
if ( (sess_time/1000 > (unsigned long long)mysql_thread___max_transaction_idle_time) || (sess_time/1000 > (unsigned long long)mysql_thread___wait_timeout) ) {
if ( (sess_time/1000 > (unsigned long long)mysql_thread___max_transaction_idle_time) || (sess_time/1000 > (unsigned long long)sess->wait_timeout) ) {
//numTrx = sess->NumActiveTransactions();
numTrx = sess->active_transactions;
if (numTrx) {
@ -3803,7 +3803,7 @@ void MySQL_Thread::ProcessAllSessions_MaintenanceLoop(MySQL_Session *sess, unsig
}
} else {
// the session is idle, kill it
if (sess_time/1000 > (unsigned long long)mysql_thread___wait_timeout) {
if (sess_time/1000 > (unsigned long long)sess->wait_timeout) {
sess->killed=true;
if (sess->client_myds) {
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);

Loading…
Cancel
Save