Skip to content

MDEV-39585/MDEV-39541 - mariadbd --bootstrap crashing in ~mem_pressure #5070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
grooverdan wants to merge 3 commits into
base: 10.11
Choose a base branch
from
Open

MDEV-39585/MDEV-39541 - mariadbd --bootstrap crashing in ~mem_pressure #5070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f618bda
MDEV-39585 mariadb bootstrap fails to perform plugin deinitalization
grooverdan May 13, 2026
6eaae24
MDEV-39585: mariadb bootstrap fails for perform plugin deinitializati…
grooverdan May 15, 2026
9e731da
MDEV-39541 mem_pressure::~mem_pressure() causes a crash on bootstrap
grooverdan May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions mysql-test/main/bootstrap_innodb.result
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
create table t1(a int) engine=innodb;
#
# MDEV-39541 mem_pressure::~mem_pressure() causes a crash on bootstrap
#
# restart
select * from t1;
a
1
2
5
drop table t1;
# End of 10.11 tests
12 changes: 12 additions & 0 deletions mysql-test/main/bootstrap_innodb.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,18 @@ EOF
exec $MYSQLD_BOOTSTRAP_CMD --datadir=$datadir --tmpdir=$MYSQL_TMP_DIR --innodb < $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1;
remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql;

--echo #
--echo # MDEV-39541 mem_pressure::~mem_pressure() causes a crash on bootstrap
--echo #

write_file $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql;
SHUTDOWN;
EOF
exec $MYSQLD_BOOTSTRAP_CMD --datadir=$datadir --tmpdir=$MYSQL_TMP_DIR --innodb < $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1;
remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql;

source include/start_mysqld.inc;
select * from t1;
drop table t1;

--echo # End of 10.11 tests
36 changes: 20 additions & 16 deletions sql/mysqld.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1667,7 +1667,8 @@ static void break_connect_loop()
abort_loop= 1;

#if defined(_WIN32)
mysqld_win_initiate_shutdown();
if (!opt_bootstrap)
mysqld_win_initiate_shutdown();
#else
mysql_mutex_lock(&LOCK_start_thread);
if (termination_event_fd >= 0)
Expand Down Expand Up @@ -1842,12 +1843,6 @@ static void close_connections(void)
}
/* End of kill phase 2 */

/*
The signal thread can use server resources, e.g. when processing SIGHUP,
and it must end gracefully before clean_up()
*/
wait_for_signal_thread_to_end();

DBUG_PRINT("quit",("close_connections thread"));
DBUG_VOID_RETURN;
}
Expand Down Expand Up @@ -2079,7 +2074,6 @@ static void clean_up(bool print_message)


#ifndef EMBEDDED_LIBRARY

/**
This is mainly needed when running with purify, but it's still nice to
know that all child threads have died when mysqld exits.
Expand Down Expand Up @@ -6041,10 +6035,7 @@ int mysqld_main(int argc, char **argv)
if (!abort_loop)
unireg_abort(bootstrap_error);
else
{
sleep(2); // Wait for kill
exit(0);
}
goto termination;
}

/* Copy default global rpl_filter to global_rpl_filter */
Expand Down Expand Up @@ -6119,11 +6110,11 @@ int mysqld_main(int argc, char **argv)
run_main_loop();

/* Shutdown requested */
char *user= shutdown_user.load(std::memory_order_relaxed);
sql_print_information(ER_DEFAULT(ER_NORMAL_SHUTDOWN), my_progname,
{
char *user= shutdown_user.load(std::memory_order_relaxed);
sql_print_information(ER_DEFAULT(ER_NORMAL_SHUTDOWN), my_progname,
user ? user : "unknown");
if (user)
my_free(user);
}

#ifdef WITH_WSREP
wsrep_shutdown();
Expand All @@ -6132,6 +6123,19 @@ int mysqld_main(int argc, char **argv)
#endif

close_connections();

termination:
{
char *user= shutdown_user.load(std::memory_order_relaxed);
if (user)
my_free(user);
Comment on lines +6129 to +6131
Copy link
Copy Markdown

@gemini-code-assist gemini-code-assist Bot May 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

It is safer to use exchange(nullptr) when retrieving the pointer from the atomic shutdown_user for freeing. This ensures that the atomic is cleared and prevents any potential double-free or dangling pointer issues if other parts of the shutdown sequence (e.g., in clean_up) were to access the same pointer.

    char *user= shutdown_user.exchange(nullptr, std::memory_order_relaxed);
    if (user)
      my_free(user);

}
/*
The signal thread can use server resources, e.g. when processing SIGHUP,
and it must end gracefully before clean_up()
*/
wait_for_signal_thread_to_end();

ha_pre_shutdown();
clean_up(1);
sd_notify(0, "STATUS=MariaDB server is down");
Expand Down
2 changes: 2 additions & 0 deletions storage/innobase/handler/ha_innodb.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4273,6 +4273,8 @@ innobase_end(handlerton*, ha_panic_function)
innodb_shutdown();
mysql_mutex_destroy(&log_requests.mutex);
}
else
buf_mem_pressure_shutdown();

DBUG_RETURN(0);
}
Expand Down
6 changes: 6 additions & 0 deletions storage/innobase/include/srv0start.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ void innodb_preshutdown();
/** Shut down InnoDB. */
void innodb_shutdown();

/** Stop mem presure thread and free file descriptors */
#ifdef __linux__
void buf_mem_pressure_shutdown() noexcept;
#else
inline void buf_mem_pressure_shutdown() noexcept {}
#endif
/*************************************************************//**
Copy the file path component of the physical file to parameter. It will
copy up to and including the terminating path separator.
Expand Down
6 changes: 0 additions & 6 deletions storage/innobase/log/log0log.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,12 +1351,6 @@ void log_free_check() noexcept
}
}

#ifdef __linux__
extern void buf_mem_pressure_shutdown() noexcept;
#else
inline void buf_mem_pressure_shutdown() noexcept {}
#endif

/** Make a checkpoint at the latest lsn on shutdown.
@return the shutdown LSN */
ATTRIBUTE_COLD lsn_t logs_empty_and_mark_files_at_shutdown() noexcept
Expand Down