mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-17780 innodb.truncate_recover crashes in recovery due to out-of-bounds page read

Browse source 
recv_addr_trim(): Do not try to detach the hash bucket, because
the code for doing that does not always work.

recv_apply_hashed_log_recs(): Do not attempt to read pages for which
there exist no redo log records.
This commit is contained in:
Marko Mäkelä 2018-11-20 14:55:44 +02:00
parent ae96b47f9e
commit b86e18cb44
1 changed files with 5 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
storage/innobase/log/log0recv.cc
View file

@ -232,9 +232,8 @@ static void recv_addr_trim(ulint space_id, unsigned pages, lsn_t lsn)
hash_cell_t* const cell = hash_get_nth_cell(
recv_sys->addr_hash, i);
for (recv_addr_t* addr = static_cast<recv_addr_t*>(cell->node),
*prev = NULL, *next;
addr;
prev = addr, addr = next) {
*next;
addr; addr = next) {
next = static_cast<recv_addr_t*>(addr->addr_hash);
if (addr->space != space_id || addr->page_no < pages) {
@ -256,22 +255,6 @@ static void recv_addr_trim(ulint space_id, unsigned pages, lsn_t lsn)
}
recv = n;
}
if (UT_LIST_GET_LEN(addr->rec_list)) {
DBUG_PRINT("ib_log",
("preserving " ULINTPF
" records for page %u:%u",
UT_LIST_GET_LEN(addr->rec_list),
addr->space, addr->page_no));
} else {
ut_ad(recv_sys->n_addrs);
--recv_sys->n_addrs;
if (addr == cell->node) {
cell->node = next;
} else {
prev->addr_hash = next;
}
}
}
}
if (fil_space_t* space = fil_space_get(space_id)) {
@ -2169,8 +2152,7 @@ static ulint recv_read_in_area(const page_id_t page_id)
/** Apply the hash table of stored log records to persistent data pages.
@param[in] last_batch whether the change buffer merge will be
performed as part of the operation */
void
recv_apply_hashed_log_recs(bool last_batch)
void recv_apply_hashed_log_recs(bool last_batch)
{
ut_ad(srv_operation == SRV_OPERATION_NORMAL
|| srv_operation == SRV_OPERATION_RESTORE
@ -2233,7 +2215,8 @@ recv_apply_hashed_log_recs(bool last_batch)
continue;
}
if (recv_addr->state == RECV_DISCARDED) {
if (recv_addr->state == RECV_DISCARDED
|| !UT_LIST_GET_LEN(recv_addr->rec_list)) {
ut_a(recv_sys->n_addrs);
recv_sys->n_addrs--;
continue;