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

Merge branch '10.6' into 10.11

Browse Source
This commit is contained in:
Oleksandr Byelkin
2025-04-21 11:23:11 +02:00
parent 7d9660ed93 a135551569
commit 20b818f45e
40 changed files with 446 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tpool/aio_liburing.cc
View File

@@ -34,9 +34,9 @@ class aio_uring final : public tpool::aio
public:
aio_uring(tpool::thread_pool *tpool, int max_aio) : tpool_(tpool)
{
if (io_uring_queue_init(max_aio, &uring_, 0) != 0)
if (const auto e= io_uring_queue_init(max_aio, &uring_, 0))
{
switch (const auto e= errno) {
switch (-e) {
case ENOMEM:
my_printf_error(ER_UNKNOWN_ERROR,
"io_uring_queue_init() failed with ENOMEM:"
@@ -57,6 +57,12 @@ public:
"(newer than 5.1 required)",
ME_ERROR_LOG | ME_WARNING);
break;
case EPERM:
my_printf_error(ER_UNKNOWN_ERROR,
"io_uring_queue_init() failed with EPERM:"
" sysctl kernel.io_uring_disabled has the value 2, or 1 and the user of the process is not a member of sysctl kernel.io_uring_group. (see man 2 io_uring_setup).",
ME_ERROR_LOG | ME_WARNING);
break;
default:
my_printf_error(ER_UNKNOWN_ERROR,
"io_uring_queue_init() failed with errno %d",

1
tpool/tpool_generic.cc
View File

@@ -218,7 +218,6 @@ class thread_pool_generic : public thread_pool
/** Overall number of enqueues*/
unsigned long long m_tasks_enqueued;
unsigned long long m_group_enqueued;
/** Overall number of dequeued tasks. */
unsigned long long m_tasks_dequeued;