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

MDEV-33098: Fix some instrumentation for innodb.doublewrite_debug

Browse Source 
buf_flush_page_cleaner(): A continue or break inside DBUG_EXECUTE_IF
actually is a no-op. Use an explicit call to _db_keyword_() to
actually avoid advancing the checkpoint.

buf_flush_list_now_set(): Invoke os_aio_wait_until_no_pending_writes()
to ensure that the page write to the system tablespace is completed.
This commit is contained in:
Marko Mäkelä
2024-01-08 14:36:54 +02:00
parent cc5c0eda4c
commit 0b612619ef
3 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/suite/innodb/t/doublewrite_debug.test
View File

@@ -61,17 +61,6 @@ set global innodb_fil_make_page_dirty_debug = 0;
set global innodb_buf_flush_list_now = 1; set global innodb_buf_flush_list_now = 1;
--let CLEANUP_IF_CHECKPOINT=drop table t1, unexpected_checkpoint; --let CLEANUP_IF_CHECKPOINT=drop table t1, unexpected_checkpoint;
# Occasionally, a checkpoint would occur on the MSAN builder.
# We do not know the reason, because the failure can only be reproduced if there is
# enough load in that environment.
# Therefore, we allow the test to be skipped when run on MSAN.
# In other environments, we want the test to fail if a checkpoint occurs,
# so that we would catch it if it starts to happen regularly.
if (`select count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like "MSAN%"`)
{
--let CLEANUP_IF_CHECKPOINT=drop table t1;
}
--source ../include/no_checkpoint_end.inc --source ../include/no_checkpoint_end.inc
--echo # Make the 1st page (page_no=0) and 2nd page (page_no=1) --echo # Make the 1st page (page_no=0) and 2nd page (page_no=1)

6
storage/innobase/buf/buf0flu.cc
View File

@@ -2333,9 +2333,9 @@ static os_thread_ret_t DECLARE_THREAD(buf_flush_page_cleaner)(void*)
do do
{ {
DBUG_EXECUTE_IF("ib_log_checkpoint_avoid", continue;); IF_DBUG(if (_db_keyword_(nullptr, "ib_log_checkpoint_avoid", 1) ||
DBUG_EXECUTE_IF("ib_log_checkpoint_avoid_hard", continue;); _db_keyword_(nullptr, "ib_log_checkpoint_avoid_hard", 1))
continue,);
if (!recv_recovery_is_on() && if (!recv_recovery_is_on() &&
!srv_startup_is_before_trx_rollback_phase && !srv_startup_is_before_trx_rollback_phase &&
srv_operation <= SRV_OPERATION_EXPORT_RESTORED) srv_operation <= SRV_OPERATION_EXPORT_RESTORED)

3
storage/innobase/handler/ha_innodb.cc
View File

@@ -18313,7 +18313,10 @@ buf_flush_list_now_set(THD*, st_mysql_sys_var*, void*, const void* save)
if (s) if (s)
buf_flush_sync(); buf_flush_sync();
else else
{
while (buf_flush_list_space(fil_system.sys_space, nullptr)); while (buf_flush_list_space(fil_system.sys_space, nullptr));
os_aio_wait_until_no_pending_writes();
}
mysql_mutex_lock(&LOCK_global_system_variables); mysql_mutex_lock(&LOCK_global_system_variables);
} }