Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion storage/innobase/buf/buf0flu.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1933,7 +1933,7 @@ inline lsn_t log_t::write_checkpoint(lsn_t checkpoint, lsn_t end_lsn) noexcept
resize_target= (offset + 4095) & ~off_t{4095};
sql_print_warning("InnoDB: Adjusting innodb_log_file_size="
LSN_PF "k", resize_target >> 10);
ut_a(os_file_set_size(get_archive_path().c_str(), resize_log.m_file,
ut_a(os_file_set_size(get_archive_path().c_str(), log.m_file,
resize_target, false));
}
}
Expand Down
8 changes: 5 additions & 3 deletions storage/innobase/log/log0log.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1522,14 +1522,16 @@ void log_t::archived_mmap_switch_prepare(bool late, bool ex) noexcept
(l & (WRITE_BACKOFF - 1));
waits++;
ut_ad(archive);
ut_ad(!resize_buf);
ut_ad(!resize_in_progress());
ut_ad(resize_target >= 4U << 20);
ut_ad(is_latest());
ut_ad(log.is_opened());
ut_ad(!!checkpoint_buf == resize_log.is_opened());
ut_ad((checkpoint_buf || resize_buf) == resize_log.is_opened());

if (UNIV_LIKELY_NULL(checkpoint_buf))
if (resize_buf)
/* archive_create(..., false) had recently succeeded in another thread */
ut_ad(!checkpoint_buf);
else if (UNIV_LIKELY_NULL(checkpoint_buf))
/* Both archived_mmap_switch_prepare() and
archived_mmap_switch_complete() were invoked by another thread,
but write_checkpoint() did not clean up yet. */
Expand Down