Skip to content
/ server Public

MDEV-38079: Crash Recovery Fails After ALTER TABLE…PAGE_COMPRESSED=1 #4565

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

Closed
mariadb-TafzeelShams wants to merge 1 commit into from
Closed

MDEV-38079: Crash Recovery Fails After ALTER TABLE…PAGE_COMPRESSED=1 #4565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/fil/fil0fil.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,7 @@ void fil_space_set_recv_size_and_flags(uint32_t id, uint32_t size,
if (size)
space->recv_size= size;
if (flags != FSP_FLAGS_FCRC32_MASK_MARKER)
space->flags= flags;
recv_sys.update_space_flags(space, flags, recv_sys.start_lsn);
}
mysql_mutex_unlock(&fil_system.mutex);
}
Expand Down
6 changes: 6 additions & 0 deletions storage/innobase/include/log0recv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,9 @@ struct recv_sys_t
/** iterator to pages, used by parse() */
map::iterator pages_it;

/** Last applied LSN for space->flags updates (used to prevent stale updates) */
std::map<uint32_t, lsn_t> space_flags_lsn;

/** The allocated size of tmp_buf. The 1+8 extra bytes are
needed for FORMAT_ENC_11 in parse(). */
static constexpr size_t tmp_buf_size{MTR_SIZE_MAX + 9};
Expand Down Expand Up @@ -324,6 +327,9 @@ struct recv_sys_t
pages_it= pages.end();
}

/** Update space->flags only if lsn >= last recorded space-flags LSN */
void update_space_flags(fil_space_t *space, uint32_t flags, lsn_t lsn);

private:
/** In parse_tail<storing=NO>(), handle INIT_PAGE or FREE_PAGE
@param id page that is being initialized or freed */
Expand Down
18 changes: 16 additions & 2 deletions storage/innobase/log/log0recv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,17 @@ const byte *mtr_t::parse_length(const byte *l, uint32_t *size) noexcept
return l;
}

/** Update space->flags only if lsn >= last recorded space-flags LSN */
void recv_sys_t::update_space_flags(fil_space_t *space, uint32_t flags, lsn_t lsn)
{
auto it = space_flags_lsn.find(space->id);
if (it == space_flags_lsn.end() || lsn >= it->second)
{
space->flags = flags;
space_flags_lsn[space->id] = lsn;
}
}

/** If the following is TRUE, the buffer pool file pages must be invalidated
after recovery and no ibuf operations are allowed; this becomes TRUE if
the log record hash table becomes too full, and log records must be merged
Expand Down Expand Up @@ -3485,10 +3496,12 @@ static buf_block_t *recv_recover_page(buf_block_t *block, mtr_t &mtr,
? space
: fil_space_t::get(block->page.id().space())) {
switch (a) {
case log_phys_t::APPLIED_TO_FSP_HEADER:
s->flags = mach_read_from_4(
case log_phys_t::APPLIED_TO_FSP_HEADER: {
uint32_t flags = mach_read_from_4(
FSP_HEADER_OFFSET
+ FSP_SPACE_FLAGS + frame);
recv_sys.update_space_flags(s, flags,
l->start_lsn);
s->size_in_header = mach_read_from_4(
FSP_HEADER_OFFSET + FSP_SIZE
+ frame);
Expand All @@ -3499,6 +3512,7 @@ static buf_block_t *recv_recover_page(buf_block_t *block, mtr_t &mtr,
FSP_HEADER_OFFSET + FSP_FREE
+ FLST_LEN + frame);
break;
}
default:
byte* b= frame
+ fsp_header_get_encryption_offset(
Expand Down