hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2555 Add execute_kill version, that kills all but a given mysql_thread_id

Browse Source 
NOTE: This does not work whit unix scokets. The reason is that LocalClient
assumes network sockets. TODO: to add unix socket support.
This commit is contained in:
Niclas Antti
2019-06-17 06:40:42 +03:00
parent 56e5c417c1
commit 2343326ecc
2 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/maxscale/protocol/mysql.hh
View File

@ -700,6 +700,17 @@ typedef enum kill_type
} kill_type_t; } kill_type_t;
void mxs_mysql_execute_kill(MXS_SESSION* issuer, uint64_t target_id, kill_type_t type); void mxs_mysql_execute_kill(MXS_SESSION* issuer, uint64_t target_id, kill_type_t type);
/** Send KILL to all but the keep_protocol_thread_id. If keep_protocol_thread_id==0, kill all.
* TODO: The naming: issuer, target_id, protocol_thread_id is not very descriptive,
* and really goes to the heart of explaining what the session_id/thread_id means in terms
* of a service/server pipeline and the recursiveness of this call.
*/
void mxs_mysql_execute_kill_all_others(MXS_SESSION* issuer,
uint64_t target_id,
uint64_t keep_protocol_thread_id,
kill_type_t type);
void mxs_mysql_execute_kill_user(MXS_SESSION* issuer, const char* user, kill_type_t type); void mxs_mysql_execute_kill_user(MXS_SESSION* issuer, const char* user, kill_type_t type);
MXS_END_DECLS MXS_END_DECLS

24
server/modules/protocol/MySQL/mysql_common.cc
View File

@ -1347,13 +1347,15 @@ static bool kill_func(DCB* dcb, void* data);
struct ConnKillInfo : public KillInfo struct ConnKillInfo : public KillInfo
{ {
ConnKillInfo(uint64_t id, std::string query, MXS_SESSION* ses) ConnKillInfo(uint64_t id, std::string query, MXS_SESSION* ses, uint64_t keep_thread_id)
: KillInfo(query, ses, kill_func) : KillInfo(query, ses, kill_func)
, target_id(id) , target_id(id)
, keep_thread_id(keep_thread_id)
{ {
} }
uint64_t target_id; uint64_t target_id;
uint64_t keep_thread_id;
}; };
static bool kill_user_func(DCB* dcb, void* data); static bool kill_user_func(DCB* dcb, void* data);
@ -1372,11 +1374,12 @@ struct UserKillInfo : public KillInfo
static bool kill_func(DCB* dcb, void* data) static bool kill_func(DCB* dcb, void* data)
{ {
ConnKillInfo* info = static_cast<ConnKillInfo*>(data); ConnKillInfo* info = static_cast<ConnKillInfo*>(data);
MySQLProtocol* proto = static_cast<MySQLProtocol*>(dcb->protocol);
if (dcb->session->ses_id == info->target_id && dcb->role == DCB::Role::BACKEND) if (dcb->session->ses_id == info->target_id
&& dcb->role == DCB::Role::BACKEND
&& (info->keep_thread_id == 0 || proto->thread_id != info->keep_thread_id))
{ {
MySQLProtocol* proto = (MySQLProtocol*)dcb->protocol;
if (proto->thread_id) if (proto->thread_id)
{ {
// DCB is connected and we know the thread ID so we can kill it // DCB is connected and we know the thread ID so we can kill it
@ -1430,6 +1433,14 @@ static void worker_func(int thread_id, void* data)
} }
void mxs_mysql_execute_kill(MXS_SESSION* issuer, uint64_t target_id, kill_type_t type) void mxs_mysql_execute_kill(MXS_SESSION* issuer, uint64_t target_id, kill_type_t type)
{
mxs_mysql_execute_kill_all_others(issuer, target_id, 0, type);
}
void mxs_mysql_execute_kill_all_others(MXS_SESSION* issuer,
uint64_t target_id,
uint64_t keep_protocol_thread_id,
kill_type_t type)
{ {
const char* hard = (type & KT_HARD) ? "HARD " : (type & KT_SOFT) ? "SOFT " : ""; const char* hard = (type & KT_HARD) ? "HARD " : (type & KT_SOFT) ? "SOFT " : "";
const char* query = (type & KT_QUERY) ? "QUERY " : ""; const char* query = (type & KT_QUERY) ? "QUERY " : "";
@ -1443,7 +1454,10 @@ void mxs_mysql_execute_kill(MXS_SESSION* issuer, uint64_t target_id, kill_type_t
mxb_worker_post_message(worker, mxb_worker_post_message(worker,
MXB_WORKER_MSG_CALL, MXB_WORKER_MSG_CALL,
(intptr_t)worker_func, (intptr_t)worker_func,
(intptr_t) new ConnKillInfo(target_id, ss.str(), issuer)); (intptr_t) new ConnKillInfo(target_id,
ss.str(),
issuer,
keep_protocol_thread_id));
} }
} }