mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-36182: Revert "MDEV-26674 workaround for mariadb-backup"

Browse source 
Remove version check on the kernel as it now corresponds to
a working RHEL9 kernel and the problem was only there in
pre-release kernels that shouldn't have been used in production.

This reverts commit 3dc0d884ec.
This commit is contained in:
Daniel Black 2025-04-16 10:09:57 +10:00
commit 51179067fc
2 changed files with 6 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
extra/mariabackup/xtrabackup.cc
View file

@ -1581,11 +1581,6 @@ uint xb_client_options_count = array_elements(xb_client_options);
static const char *dbug_option;
#endif
#ifdef HAVE_URING
extern const char *io_uring_may_be_unsafe;
bool innodb_use_native_aio_default();
#endif
struct my_option xb_server_options[] =
{
{"datadir", 'h', "Path to the database root.", (G_PTR*) &mysql_data_home,
@ -1705,12 +1700,7 @@ struct my_option xb_server_options[] =
"Use native AIO if supported on this platform.",
(G_PTR*) &srv_use_native_aio,
(G_PTR*) &srv_use_native_aio, 0, GET_BOOL, NO_ARG,
#ifdef HAVE_URING
innodb_use_native_aio_default(),
#else
TRUE,
#endif
0, 0, 0, 0, 0},
TRUE, 0, 0, 0, 0, 0},
{"innodb_page_size", OPT_INNODB_PAGE_SIZE,
"The universal page size of the database.",
(G_PTR*) &innobase_page_size, (G_PTR*) &innobase_page_size, 0,
@ -2302,12 +2292,8 @@ static bool innodb_init_param()
msg("InnoDB: Using Linux native AIO");
}
#elif defined(HAVE_URING)
if (!srv_use_native_aio) {
} else if (io_uring_may_be_unsafe) {
msg("InnoDB: Using liburing on this kernel %s may cause hangs;"
" see https://jira.mariadb.org/browse/MDEV-26674",
io_uring_may_be_unsafe);
} else {
if (srv_use_native_aio) {
msg("InnoDB: Using liburing");
}
#else

7
storage/innobase/handler/ha_innodb.cc
View file

@ -151,7 +151,7 @@ void close_thread_tables(THD* thd);
#ifdef HAVE_URING
/** The Linux kernel version if io_uring() is considered unsafe */
const char *io_uring_may_be_unsafe;
static const char *io_uring_may_be_unsafe;
#endif
#define INSIDE_HA_INNOBASE_CC
@ -19502,10 +19502,9 @@ static MYSQL_SYSVAR_STR(version, innodb_version_str,
#ifdef HAVE_URING
# include <sys/utsname.h>
static utsname uname_for_io_uring;
#else
static
#endif
bool innodb_use_native_aio_default()
static bool innodb_use_native_aio_default()
{
#ifdef HAVE_URING
utsname &u= uname_for_io_uring;