database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-22696 TP_pool_generic::set_pool_size logic so that it marks each connection to change group before the next socket read.

Browse Source
This commit is contained in:
Vladislav Vaintroub
2020-05-23 13:17:50 +02:00
parent 9aa6042a0d
commit e6f0371556
2 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
sql/threadpool_generic.cc
View File

@ -1375,6 +1375,12 @@ static void set_next_timeout_check(ulonglong abstime)
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
static size_t get_group_id(my_thread_id tid)
{
return size_t(tid % group_count);
}
TP_connection_generic::TP_connection_generic(CONNECT *c): TP_connection_generic::TP_connection_generic(CONNECT *c):
TP_connection(c), TP_connection(c),
thread_group(0), thread_group(0),
@ -1382,10 +1388,14 @@ TP_connection_generic::TP_connection_generic(CONNECT *c):
prev_in_queue(0), prev_in_queue(0),
abs_wait_timeout(ULONGLONG_MAX), abs_wait_timeout(ULONGLONG_MAX),
bound_to_poll_descriptor(false), bound_to_poll_descriptor(false),
waiting(false) waiting(false),
fix_group(false)
#ifdef HAVE_IOCP #ifdef HAVE_IOCP
, overlapped() , overlapped()
#endif #endif
#ifdef _WIN32
, vio_type(c->vio_type)
#endif
{ {
DBUG_ASSERT(c->vio_type != VIO_CLOSED); DBUG_ASSERT(c->vio_type != VIO_CLOSED);
@ -1398,8 +1408,7 @@ TP_connection_generic::TP_connection_generic(CONNECT *c):
/* Assign connection to a group. */ /* Assign connection to a group. */
thread_group_t *group= thread_group_t *group=
&all_groups[c->thread_id%group_count]; &all_groups[get_group_id(c->thread_id)];
thread_group=group; thread_group=group;
mysql_mutex_lock(&group->mutex); mysql_mutex_lock(&group->mutex);
@ -1473,6 +1482,7 @@ static int change_group(TP_connection_generic *c,
return ret; return ret;
} }
int TP_connection_generic::start_io() int TP_connection_generic::start_io()
{ {
/* /*
@ -1485,13 +1495,16 @@ int TP_connection_generic::start_io()
So we recalculate in which group the connection should be, based So we recalculate in which group the connection should be, based
on thread_id and current group count, and migrate if necessary. on thread_id and current group count, and migrate if necessary.
*/ */
thread_group_t *group = if (fix_group)
&all_groups[thd->thread_id%group_count];
if (group != thread_group)
{ {
if (change_group(this, thread_group, group)) fix_group = false;
return -1; thread_group_t *new_group= &all_groups[get_group_id(thd->thread_id)];
if (new_group != thread_group)
{
if (change_group(this, thread_group, new_group))
return -1;
}
} }
/* /*
@ -1615,6 +1628,14 @@ TP_pool_generic::~TP_pool_generic()
} }
static my_bool thd_reset_group(THD* thd, void*)
{
auto c= (TP_connection_generic*)thd->event_scheduler.data;
if(c)
c->fix_group= true;
return FALSE;
}
/** Ensure that poll descriptors are created when threadpool_size changes */ /** Ensure that poll descriptors are created when threadpool_size changes */
int TP_pool_generic::set_pool_size(uint size) int TP_pool_generic::set_pool_size(uint size)
{ {
@ -1641,6 +1662,7 @@ int TP_pool_generic::set_pool_size(uint size)
} }
} }
group_count= size; group_count= size;
server_threads.iterate(thd_reset_group);
return 0; return 0;
} }

1
sql/threadpool_generic.h
View File

@ -89,6 +89,7 @@ struct TP_connection_generic :public TP_connection
TP_file_handle fd; TP_file_handle fd;
bool bound_to_poll_descriptor; bool bound_to_poll_descriptor;
int waiting; int waiting;
bool fix_group;
#ifdef HAVE_IOCP #ifdef HAVE_IOCP
OVERLAPPED overlapped; OVERLAPPED overlapped;
#endif #endif