Skip to content

Commit

Permalink
MDEV-24913 Assertion !recv_no_log_write in log_write_up_to()
Browse files Browse the repository at this point in the history
- The commit 5fd3c74(MDEV-24709)
resets the recv_no_ibuf_operations in
recv_recovery_from_checkpoint_start(), but InnoDB fails to reset
the variable recv_no_log_write() during that time and that leads
to the assert failure.
  • Loading branch information
Thirunarayanan committed Feb 23, 2021
1 parent 3c02148 commit 787c475
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions storage/innobase/log/log0recv.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2416,8 +2416,6 @@ void recv_apply_hashed_log_recs(bool last_batch)
recv_no_ibuf_operations
= !last_batch || is_mariabackup_restore_or_export();

ut_d(recv_no_log_write = recv_no_ibuf_operations);

if (ulint n = recv_sys->n_addrs) {
const char* msg = last_batch
? "Starting final batch to recover "
Expand Down Expand Up @@ -4002,6 +4000,7 @@ recv_recovery_from_checkpoint_start(lsn_t flush_lsn)

recv_sys->apply_log_recs = TRUE;
recv_no_ibuf_operations = is_mariabackup_restore_or_export();
ut_d(recv_no_log_write = recv_no_ibuf_operations);

mutex_exit(&recv_sys->mutex);

Expand Down

0 comments on commit 787c475

Please sign in to comment.