Skip to content

Commit

Permalink
MDEV-30860 Race condition between buffer pool flush and log file dele…
Browse files Browse the repository at this point in the history
…tion in mariadb-backup --prepare

srv_start(): If we are going to close the log file in
mariadb-backup --prepare, call buf_flush_sync() before
calling recv_sys.debug_free() to ensure that the log file
will not be accessed.

This fixes a rather rare failure in the test
mariabackup.innodb_force_recovery where buf_flush_page_cleaner()
would invoke log_checkpoint_low() because !recv_recovery_is_on()
would hold due to the fact that recv_sys.debug_free() had
already been called. Then, the log write for the checkpoint
would fail because srv_start() had invoked log_sys.log.close_file().
  • Loading branch information
dr-m committed Mar 16, 2023
1 parent 7d6b3d4 commit 1495f05
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions storage/innobase/srv/srv0start.cc
Expand Up @@ -922,9 +922,7 @@ static lsn_t srv_prepare_to_delete_redo_log_file(bool old_exists)
{
DBUG_ENTER("srv_prepare_to_delete_redo_log_file");

/* Disable checkpoints in the page cleaner. */
ut_ad(!recv_sys.recovery_on);
recv_sys.recovery_on= true;
ut_ad(recv_sys.recovery_on);

/* Clean the buffer pool. */
buf_flush_sync();
Expand Down Expand Up @@ -1606,10 +1604,10 @@ dberr_t srv_start(bool create_new_db)
}
}

recv_sys.debug_free();

if (srv_operation == SRV_OPERATION_RESTORE
|| srv_operation == SRV_OPERATION_RESTORE_EXPORT) {
buf_flush_sync();
recv_sys.debug_free();
/* After applying the redo log from
SRV_OPERATION_BACKUP, flush the changes
to the data files and truncate or delete the log.
Expand Down Expand Up @@ -1701,6 +1699,8 @@ dberr_t srv_start(bool create_new_db)
return(srv_init_abort(err));
}
}

recv_sys.debug_free();
}

ut_ad(err == DB_SUCCESS);
Expand Down

0 comments on commit 1495f05

Please sign in to comment.